makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

change arabic-numbers list-style-type to correct type decimal (Bug #30775)

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9461 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-04-17 15:23:17 +00:00
parent 556b177e9c
commit a7be268aa6
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/bbcode.php
View file

@ -134,7 +134,7 @@ class bbcode
{ {
$this->template_bitfield = new bitfield($user->theme['bbcode_bitfield']); $this->template_bitfield = new bitfield($user->theme['bbcode_bitfield']);
$this->template_filename = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template/bbcode.html'; $this->template_filename = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template/bbcode.html';
if (!@file_exists($this->template_filename)) if (!@file_exists($this->template_filename))
{ {
if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id']) if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'])
@ -410,7 +410,7 @@ class bbcode
if (empty($bbcode_hardtpl)) if (empty($bbcode_hardtpl))
{ {
global $user; global $user;
$bbcode_hardtpl = array( $bbcode_hardtpl = array(
'b_open' => '<span style="font-weight: bold">', 'b_open' => '<span style="font-weight: bold">',
'b_close' => '</span>', 'b_close' => '</span>',
@ -528,12 +528,12 @@ class bbcode
else if (is_numeric($type)) else if (is_numeric($type))
{ {
$tpl = 'olist_open'; $tpl = 'olist_open';
$type = 'arabic-numbers'; $type = 'decimal';
} }
else else
{ {
$tpl = 'olist_open'; $tpl = 'olist_open';
$type = 'arabic-numbers'; $type = 'decimal';
} }
return str_replace('{LIST_TYPE}', $type, $this->bbcode_tpl($tpl)); return str_replace('{LIST_TYPE}', $type, $this->bbcode_tpl($tpl));

2
phpBB/language/en/help_bbcode.php
View file

@ -76,7 +76,7 @@ $help = array(
), ),
array( array(
0 => 'Creating an Ordered list', 0 => 'Creating an Ordered list',
1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use <strong>[list=1][/list]</strong> to create a numbered list or alternatively <strong>[list=a][/list]</strong> for an alphabetical list. As with the unordered list, items are specified using <strong>[*]</strong>. For example:<br /><br /><strong>[list=1]</strong><br /><strong>[*]</strong>Go to the shops<br /><strong>[*]</strong>Buy a new computer<br /><strong>[*]</strong>Swear at computer when it crashes<br /><strong>[/list]</strong><br /><br />will generate the following:<ol style="list-style-type: arabic-numbers"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><strong>[list=a]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>' 1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use <strong>[list=1][/list]</strong> to create a numbered list or alternatively <strong>[list=a][/list]</strong> for an alphabetical list. As with the unordered list, items are specified using <strong>[*]</strong>. For example:<br /><br /><strong>[list=1]</strong><br /><strong>[*]</strong>Go to the shops<br /><strong>[*]</strong>Buy a new computer<br /><strong>[*]</strong>Swear at computer when it crashes<br /><strong>[/list]</strong><br /><br />will generate the following:<ol style="list-style-type: decimal;"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use:<br /><br /><strong>[list=a]</strong><br /><strong>[*]</strong>The first possible answer<br /><strong>[*]</strong>The second possible answer<br /><strong>[*]</strong>The third possible answer<br /><strong>[/list]</strong><br /><br />giving<ol style="list-style-type: lower-alpha"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>'
), ),
array( array(
0 => '--', 0 => '--',