diff options
| author | David King <imkingdavid@gmail.com> | 2012-08-22 09:37:47 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-08-22 09:37:47 -0400 |
| commit | 575980cba981c2522cc7d3e66e64b9c8fbc36511 (patch) | |
| tree | 4ba9fa679d376481a4c6bcac9e243e1d7e1dfcd4 /phpBB/includes/functions_content.php | |
| parent | 46597be1a372f1215ffc18cfd645c1e977b44d84 (diff) | |
| download | forums-575980cba981c2522cc7d3e66e64b9c8fbc36511.tar forums-575980cba981c2522cc7d3e66e64b9c8fbc36511.tar.gz forums-575980cba981c2522cc7d3e66e64b9c8fbc36511.tar.bz2 forums-575980cba981c2522cc7d3e66e64b9c8fbc36511.tar.xz forums-575980cba981c2522cc7d3e66e64b9c8fbc36511.zip | |
[feature/add_events] Remove $allow_bbcode and $allow_smilies
Upon testing it was discovered that these did not work as originally intended.
PHPBB3-9550
Diffstat (limited to 'phpBB/includes/functions_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 81ac15f168..7fb6ff44cf 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -418,7 +418,7 @@ function generate_text_for_display($text, $uid, $bitfield, $flags) return ''; } - $censor_text = $allow_bbcode = $allow_smilies = true; + $censor_text = true; /** * Use this event to modify the text before it is parsed @@ -429,11 +429,9 @@ function generate_text_for_display($text, $uid, $bitfield, $flags) * @var string bitfield The BBCode Bitfield * @var int flags The BBCode Flags * @var bool censor_text Whether or not to apply word censors - * @var bool allow_bbcode Whether or not to parse BBCode - * @var bool allow_smilies Whether or not to parse Smilies * @since 3.1-A1 */ - $vars = array('text', 'uid', 'bitfield', 'flags', 'censor_text', 'allow_bbcode', 'allow_smilies'); + $vars = array('text', 'uid', 'bitfield', 'flags', 'censor_text'); extract($phpbb_dispatcher->trigger_event('core.modify_text_for_display_before', compact($vars))); if ($censor_text) @@ -442,7 +440,7 @@ function generate_text_for_display($text, $uid, $bitfield, $flags) } // Parse bbcode if bbcode uid stored and bbcode enabled - if ($uid && ($flags & OPTION_FLAG_BBCODE) && $allow_bbcode) + if ($uid && ($flags & OPTION_FLAG_BBCODE)) { if (!class_exists('bbcode')) { @@ -463,11 +461,7 @@ function generate_text_for_display($text, $uid, $bitfield, $flags) } $text = bbcode_nl2br($text); - - if ($allow_smilies) - { - $text = smiley_text($text, !($flags & OPTION_FLAG_SMILIES)); - } + $text = smiley_text($text, !($flags & OPTION_FLAG_SMILIES)); /** * Use this event to modify the text after it is parsed |