diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-10-13 02:17:24 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-10-13 02:17:24 +0000 |
| commit | f4f5d9a471b5f5a74895b5e7bf6037235589abfc (patch) | |
| tree | 02ebbbbff1a1e3703f572057df3846df3446defd /phpBB | |
| parent | 9cd0a6ad4d67393675ba3fc25694c7f582f1af9f (diff) | |
| download | forums-f4f5d9a471b5f5a74895b5e7bf6037235589abfc.tar forums-f4f5d9a471b5f5a74895b5e7bf6037235589abfc.tar.gz forums-f4f5d9a471b5f5a74895b5e7bf6037235589abfc.tar.bz2 forums-f4f5d9a471b5f5a74895b5e7bf6037235589abfc.tar.xz forums-f4f5d9a471b5f5a74895b5e7bf6037235589abfc.zip | |
Parse BBCode lists of type square, circle and disc. #35295
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9007 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/message_parser.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 1806e942d1..f70516e558 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -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] 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] 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] Display warning in ACP if config.php file is left writable.</li> diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index c4e39ebab6..0f0a821c84 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -604,7 +604,7 @@ class bbcode_firstpass extends bbcode $out .= array_pop($list_end_tags) . ']'; $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 if (empty($m[1]) || preg_match('/^(?:disc|square|circle)$/i', $m[1])) |