aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/message_parser.php
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-03-08 01:00:51 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-03-08 01:00:51 +0000
commit70203a71237a4611f33974536d378ae8d88b490d (patch)
treef5237e9765975ad82735c1db92f139f9eac491f0 /phpBB/includes/message_parser.php
parent87d22e577e6a19d12becd9cc4ad6c5f4582f05a0 (diff)
downloadforums-70203a71237a4611f33974536d378ae8d88b490d.tar
forums-70203a71237a4611f33974536d378ae8d88b490d.tar.gz
forums-70203a71237a4611f33974536d378ae8d88b490d.tar.bz2
forums-70203a71237a4611f33974536d378ae8d88b490d.tar.xz
forums-70203a71237a4611f33974536d378ae8d88b490d.zip
#8456
git-svn-id: file:///svn/phpbb/trunk@7147 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r--phpBB/includes/message_parser.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index e2f3a2b271..0450e49e64 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -113,7 +113,7 @@ class bbcode_firstpass extends bbcode
'i' => array('bbcode_id' => 2, 'regexp' => array('#\[i\](.*?)\[/i\]#ise' => "\$this->bbcode_italic('\$1')")),
'url' => array('bbcode_id' => 3, 'regexp' => array('#\[url(=(.*))?\](.*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")),
'img' => array('bbcode_id' => 4, 'regexp' => array('#\[img\](https?://)([a-z0-9\-\.,\?!%\*_:;~\\&$@/=\+]+)\[/img\]#ie' => "\$this->bbcode_img('\$1\$2')")),
- 'size' => array('bbcode_id' => 5, 'regexp' => array('#\[size=([\-\+]?[1-2]?[0-9])\](.*?)\[/size\]#ise' => "\$this->bbcode_size('\$1', '\$2')")),
+ 'size' => array('bbcode_id' => 5, 'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#ise' => "\$this->bbcode_size('\$1', '\$2')")),
'color' => array('bbcode_id' => 6, 'regexp' => array('!\[color=(#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!ise' => "\$this->bbcode_color('\$1', '\$2')")),
'u' => array('bbcode_id' => 7, 'regexp' => array('#\[u\](.*?)\[/u\]#ise' => "\$this->bbcode_underline('\$1')")),
'list' => array('bbcode_id' => 9, 'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#ise' => "\$this->bbcode_parse_list('\$0')")),
@@ -656,6 +656,7 @@ class bbcode_firstpass extends bbcode
$this->parsed_items['quote']++;
// the buffer holds a valid opening tag
+ $config['max_quote_depth'] = 0;
if ($config['max_quote_depth'] && sizeof($close_tags) >= $config['max_quote_depth'])
{
// there are too many nested quotes