aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/message_parser.php15
1 files changed, 5 insertions, 10 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 4961979d73..8979511d9a 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1064,17 +1064,12 @@ class parse_message extends bbcode_firstpass
$this->mode = $mode;
- if (!isset($config['max_' . $mode . '_chars']))
+ foreach (array('chars', 'smilies', 'urls', 'font_size', 'img_height', 'img_width') as $key)
{
- $config['max_' . $mode . '_chars'] = 0;
- }
- if (!isset($config['max_' . $mode . '_smilies']))
- {
- $config['max_' . $mode . '_smilies'] = 0;
- }
- if (!isset($config['max_' . $mode . '_urls']))
- {
- $config['max_' . $mode . '_urls'] = 0;
+ if (!isset($config['max_' . $mode . '_' . $key]))
+ {
+ $config['max_' . $mode . '_' . $key] = 0;
+ }
}
$this->allow_img_bbcode = $allow_img_bbcode;