diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-05-25 08:52:45 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-05-25 08:52:45 +0200 |
| commit | de4b2eb6205ff14a8dc2f613dd1e2e18b72c11c1 (patch) | |
| tree | 86b8c1e0025c21d756a692cbae1d2894b5c2e628 | |
| parent | 37e30ad83e965f80a630f35f60c3ce1b97995598 (diff) | |
| parent | 3f58b5f9abcd112e11f823968ab6cd90b07956bd (diff) | |
| download | forums-de4b2eb6205ff14a8dc2f613dd1e2e18b72c11c1.tar forums-de4b2eb6205ff14a8dc2f613dd1e2e18b72c11c1.tar.gz forums-de4b2eb6205ff14a8dc2f613dd1e2e18b72c11c1.tar.bz2 forums-de4b2eb6205ff14a8dc2f613dd1e2e18b72c11c1.tar.xz forums-de4b2eb6205ff14a8dc2f613dd1e2e18b72c11c1.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/includes/functions_content.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 387606a300..c3e7a7ceb7 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -734,9 +734,11 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bb * @var string uid The BBCode UID * @var string bitfield The BBCode Bitfield * @var int flags The BBCode Flags + * @var string message_parser The message_parser object * @since 3.1.0-a1 + * @changed 3.1.11-RC1 Added message_parser to vars */ - $vars = array('text', 'uid', 'bitfield', 'flags'); + $vars = array('text', 'uid', 'bitfield', 'flags', 'message_parser'); extract($phpbb_dispatcher->trigger_event('core.modify_text_for_storage_after', compact($vars))); return $message_parser->warn_msg; |