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

Parse BBCode lists of type square, circle and disc. #35295

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9007 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Chris Smith 2008-10-13 02:17:24 +00:00
parent 9cd0a6ad4d
commit f4f5d9a471
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -141,6 +141,7 @@
<li>[Fix] Display profile icons when viewing a topic, or PM when only the jabber icon is to be visible. (Bug #34755)</li> <li>[Fix] Display profile icons when viewing a topic, or PM when only the jabber icon is to be visible. (Bug #34755)</li>
<li>[Fix] Do not send PMs with warnings if the user cannot read PMs or they are disabled. (Bug #30815)</li> <li>[Fix] Do not send PMs with warnings if the user cannot read PMs or they are disabled. (Bug #30815)</li>
<li>[Fix] Correctly convert Neil's Birthday MOD to the date format used in phpBB3. (Bug #32895)</li> <li>[Fix] Correctly convert Neil's Birthday MOD to the date format used in phpBB3. (Bug #32895)</li>
<li>[Fix] Parse BBCode lists of type square, circle and disc. (Bug #35295)</li>
<li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li> <li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li>
<li>[Change] Display warning in ACP if config.php file is left writable.</li> <li>[Change] Display warning in ACP if config.php file is left writable.</li>

2
phpBB/includes/message_parser.php
View file

@ -604,7 +604,7 @@ class bbcode_firstpass extends bbcode
$out .= array_pop($list_end_tags) . ']'; $out .= array_pop($list_end_tags) . ']';
$tok = '['; $tok = '[';
} }
else if (preg_match('#^list(=[0-9a-z])?$#i', $buffer, $m)) else if (preg_match('#^list(=[0-9a-z]+)?$#i', $buffer, $m))
{ {
// sub-list, add a closing tag // sub-list, add a closing tag
if (empty($m[1]) || preg_match('/^(?:disc|square|circle)$/i', $m[1])) if (empty($m[1]) || preg_match('/^(?:disc|square|circle)$/i', $m[1]))