diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-22 08:51:09 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-08-22 08:51:09 +0200 |
| commit | 1a9bc8a7adf001f2ff77f5f98f82321c302277e6 (patch) | |
| tree | 92b2efc51c85fa57739b89964318f697f77fbd25 | |
| parent | 6cdb61e68c2eb2b820eb1e42d5568f506ecb0122 (diff) | |
| parent | 2d24b9b61f16803371f36f7dbedc1e847d087383 (diff) | |
| download | forums-1a9bc8a7adf001f2ff77f5f98f82321c302277e6.tar forums-1a9bc8a7adf001f2ff77f5f98f82321c302277e6.tar.gz forums-1a9bc8a7adf001f2ff77f5f98f82321c302277e6.tar.bz2 forums-1a9bc8a7adf001f2ff77f5f98f82321c302277e6.tar.xz forums-1a9bc8a7adf001f2ff77f5f98f82321c302277e6.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/includes/message_parser.php
| -rw-r--r-- | phpBB/includes/message_parser.php | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 5afbe5062e..c50212e8ff 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1349,6 +1349,29 @@ class parse_message extends bbcode_firstpass $return_message = &$this->message; } + $text = $this->message; + $uid = $this->bbcode_uid; + + /** + * Event to modify the text before it is parsed + * + * @event core.modify_format_display_text_before + * @var string text The message text to parse + * @var string uid The bbcode uid + * @var bool allow_bbcode Do we allow bbcodes + * @var bool allow_magic_url Do we allow magic urls + * @var bool allow_smilies Do we allow smilies + * @var bool update_this_message Do we update the internal message + * with the parsed result + * @since 3.1.6-RC1 + */ + $vars = array('text', 'uid', 'allow_bbcode', 'allow_magic_url', 'allow_smilies', 'update_this_message'); + extract($phpbb_dispatcher->trigger_event('core.modify_format_display_text_before', compact($vars))); + + $this->message = $text; + $this->bbcode_uid = $uid; + unset($text, $uid); + // NOTE: message_status is unreliable for detecting unparsed text because some callers // change $this->message without resetting $this->message_status to 'plain' so we // inspect the message instead |