diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-06 11:29:18 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-06 11:29:18 +0100 |
| commit | 778c8e89d395a3f55d0508b9ed64efc7486049f5 (patch) | |
| tree | de306801e91873085161f72fb7d57b3981705dc3 | |
| parent | ba90746ce5325c75fd0ed53d7b0185ae2d74a614 (diff) | |
| parent | 87578e90eb1ac78a46cc72e30e1b9a360da8402f (diff) | |
| download | forums-778c8e89d395a3f55d0508b9ed64efc7486049f5.tar forums-778c8e89d395a3f55d0508b9ed64efc7486049f5.tar.gz forums-778c8e89d395a3f55d0508b9ed64efc7486049f5.tar.bz2 forums-778c8e89d395a3f55d0508b9ed64efc7486049f5.tar.xz forums-778c8e89d395a3f55d0508b9ed64efc7486049f5.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/includes/message_parser.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 12ef94c07a..9a67473cf9 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1172,13 +1172,18 @@ class parse_message extends bbcode_firstpass * @var bool update_this_message Do we alter the parsed message * @var string mode Posting mode * @var string message The message text to parse + * @var string bbcode_bitfield The bbcode_bitfield before parsing + * @var string bbcode_uid The bbcode_uid before parsing * @var bool return Do we return after the event is triggered if $warn_msg is not empty * @var array warn_msg Array of the warning messages * @since 3.1.2-RC1 + * @change 3.1.3-RC1 Added vars $bbcode_bitfield and $bbcode_uid */ $message = $this->message; $warn_msg = $this->warn_msg; $return = false; + $bbcode_bitfield = $this->bbcode_bitfield; + $bbcode_uid = $this->bbcode_uid; $vars = array( 'allow_bbcode', 'allow_magic_url', @@ -1190,12 +1195,16 @@ class parse_message extends bbcode_firstpass 'update_this_message', 'mode', 'message', + 'bbcode_bitfield', + 'bbcode_uid', 'return', 'warn_msg', ); extract($phpbb_dispatcher->trigger_event('core.message_parser_check_message', compact($vars))); $this->message = $message; $this->warn_msg = $warn_msg; + $this->bbcode_bitfield = $bbcode_bitfield; + $this->bbcode_uid = $bbcode_uid; if ($return && !empty($this->warn_msg)) { return (!$update_this_message) ? $return_message : $this->warn_msg; |