diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-11-01 15:33:44 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-11-01 15:33:44 +0000 |
| commit | b5c4dc32848e64842077d1a35d5649a38ef194b6 (patch) | |
| tree | 705f26afa4b1ff84f830bec9545ab1b8e9479305 /phpBB/includes/message_parser.php | |
| parent | 5553cfc2ed81ba9eb571804c431def962720b39e (diff) | |
| download | forums-b5c4dc32848e64842077d1a35d5649a38ef194b6.tar forums-b5c4dc32848e64842077d1a35d5649a38ef194b6.tar.gz forums-b5c4dc32848e64842077d1a35d5649a38ef194b6.tar.bz2 forums-b5c4dc32848e64842077d1a35d5649a38ef194b6.tar.xz forums-b5c4dc32848e64842077d1a35d5649a38ef194b6.zip | |
check for additional empty config variables...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10249 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 15 |
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; |