aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-11-29 14:09:32 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-11-29 14:09:32 +0000
commitf3fd02548a94825195e6946cacad8c8c339e50ca (patch)
tree807cd62a1543a86286555028bd2bb70858cb0d27
parentdf58b050f04c77b059ec8592595bd1a4fd1ca392 (diff)
downloadforums-f3fd02548a94825195e6946cacad8c8c339e50ca.tar
forums-f3fd02548a94825195e6946cacad8c8c339e50ca.tar.gz
forums-f3fd02548a94825195e6946cacad8c8c339e50ca.tar.bz2
forums-f3fd02548a94825195e6946cacad8c8c339e50ca.tar.xz
forums-f3fd02548a94825195e6946cacad8c8c339e50ca.zip
do not allow [size=0]
git-svn-id: file:///svn/phpbb/trunk@8256 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/message_parser.php6
2 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index ccf5aa4293..b3370cd862 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -107,6 +107,7 @@
<li>[Fix] Check error reporting level for all error level. This fixes a problem for hosts having manipulated the error handler. (Bug #14831)</li>
<li>[Fix] Recache Moderators when copying permissions. (Bug #15384)</li>
<li>[Fix] Propagate sort options in mcp_forums (Bug #15464)</li>
+ <li>[Change] Do not allow [size=0] bbcodes (font-size of 0)</li>
</ul>
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index acc4547039..6e601e1499 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -208,6 +208,12 @@ class bbcode_firstpass extends bbcode
return '[size=' . $stx . ']' . $in . '[/size]';
}
+ // Do not allow size=0
+ if ($stx <= 0)
+ {
+ return '[size=' . $stx . ']' . $in . '[/size]';
+ }
+
return '[size=' . $stx . ':' . $this->bbcode_uid . ']' . $in . '[/size:' . $this->bbcode_uid . ']';
}