mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-11 01:55:24 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source
This commit is contained in:
Marc Alexander 2017-05-25 08:52:45 +02:00
commit de4b2eb620
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/functions_content.php
View File

@ -734,9 +734,11 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bb
* @var string uid The BBCode UID * @var string uid The BBCode UID
* @var string bitfield The BBCode Bitfield * @var string bitfield The BBCode Bitfield
* @var int flags The BBCode Flags * @var int flags The BBCode Flags
* @var string message_parser The message_parser object
* @since 3.1.0-a1 * @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))); extract($phpbb_dispatcher->trigger_event('core.modify_text_for_storage_after', compact($vars)));
return $message_parser->warn_msg; return $message_parser->warn_msg;