diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-02-27 12:44:28 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-02-27 12:44:28 +0100 |
| commit | cb6ae863f56efe62b1f5c5d4ea3a9e3a12cf4c7b (patch) | |
| tree | 7c25fb49897f1b925d88da09279dd925421eacf2 /phpBB | |
| parent | 7c41be4f516708d0eb835db0bd8418730d46ec1e (diff) | |
| parent | 747a70964e68094192887ff4bbba998fd74cda74 (diff) | |
| download | forums-cb6ae863f56efe62b1f5c5d4ea3a9e3a12cf4c7b.tar forums-cb6ae863f56efe62b1f5c5d4ea3a9e3a12cf4c7b.tar.gz forums-cb6ae863f56efe62b1f5c5d4ea3a9e3a12cf4c7b.tar.bz2 forums-cb6ae863f56efe62b1f5c5d4ea3a9e3a12cf4c7b.tar.xz forums-cb6ae863f56efe62b1f5c5d4ea3a9e3a12cf4c7b.zip | |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/includes/functions_content.php
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_content.php | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index dda752c6ca..39a3f0352f 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -434,7 +434,20 @@ function phpbb_clean_search_string($search_string) */ function decode_message(&$message, $bbcode_uid = '') { - global $phpbb_container; + global $phpbb_container, $phpbb_dispatcher; + + /** + * Use this event to modify the message before it is decoded + * + * @event core.decode_message_before + * @var string message_text The message content + * @var string bbcode_uid The message BBCode UID + * @since 3.1.9-RC1 + */ + $message_text = $message; + $vars = array('message_text', 'bbcode_uid'); + extract($phpbb_dispatcher->trigger_event('core.decode_message_before', compact($vars))); + $message = $message_text; if (preg_match('#^<[rt][ >]#', $message)) { @@ -460,6 +473,19 @@ function decode_message(&$message, $bbcode_uid = '') $message = preg_replace($match, $replace, $message); } + + /** + * Use this event to modify the message after it is decoded + * + * @event core.decode_message_after + * @var string message_text The message content + * @var string bbcode_uid The message BBCode UID + * @since 3.1.9-RC1 + */ + $message_text = $message; + $vars = array('message_text', 'bbcode_uid'); + extract($phpbb_dispatcher->trigger_event('core.decode_message_after', compact($vars))); + $message = $message_text; } /** |