Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2018-10-08 21:24:04 +02:00
commit d3aae52d66
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -327,6 +327,7 @@ class messenger
$subject = $this->subject; $subject = $this->subject;
$message = $this->msg; $message = $this->msg;
$template = $this->template;
/** /**
* Event to modify notification message text before parsing * Event to modify notification message text before parsing
* *
@ -336,13 +337,16 @@ class messenger
* and the message without sending it * and the message without sending it
* @var string subject The message subject * @var string subject The message subject
* @var string message The message text * @var string message The message text
* @var \phpbb\template\template template Template object
* @since 3.1.11-RC1 * @since 3.1.11-RC1
* @changed 3.2.4-RC1 Added template
*/ */
$vars = array( $vars = array(
'method', 'method',
'break', 'break',
'subject', 'subject',
'message', 'message',
'template',
); );
extract($phpbb_dispatcher->trigger_event('core.modify_notification_message', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.modify_notification_message', compact($vars)));
$this->subject = $subject; $this->subject = $subject;