diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:13:39 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:13:39 +0200 |
| commit | be76d582dceabdba614ccc6e76dad7ea19b3006b (patch) | |
| tree | f2fb8a9cdee56ba54a8b49268fb65c3dfb36ae5d /phpBB/includes/functions_messenger.php | |
| parent | 346c784bf3e25ce72ecf30c0436f114599944932 (diff) | |
| parent | acf9cdba01febd0d5627f20f22e6c61d63519fbc (diff) | |
| download | forums-be76d582dceabdba614ccc6e76dad7ea19b3006b.tar forums-be76d582dceabdba614ccc6e76dad7ea19b3006b.tar.gz forums-be76d582dceabdba614ccc6e76dad7ea19b3006b.tar.bz2 forums-be76d582dceabdba614ccc6e76dad7ea19b3006b.tar.xz forums-be76d582dceabdba614ccc6e76dad7ea19b3006b.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index d2cbbb17f1..ab7f00a65a 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -306,10 +306,16 @@ class messenger /** * Send the mail out to the recipients set previously in var $this->addresses + * + * @param int $method User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH + * @param bool $break Flag indicating if the function only formats the subject + * and the message without sending it + * + * @return bool */ function send($method = NOTIFY_EMAIL, $break = false) { - global $config, $user; + global $config, $user, $phpbb_dispatcher; // We add some standard variables we always use, no need to specify them always $this->assign_vars(array( @@ -318,6 +324,30 @@ class messenger 'SITENAME' => htmlspecialchars_decode($config['sitename']), )); + $subject = $this->subject; + $message = $this->msg; + /** + * Event to modify notification message text before parsing + * + * @event core.modify_notification_message + * @var int method User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH + * @var bool break Flag indicating if the function only formats the subject + * and the message without sending it + * @var string subject The message subject + * @var string message The message text + * @since 3.1.11-RC1 + */ + $vars = array( + 'method', + 'break', + 'subject', + 'message', + ); + extract($phpbb_dispatcher->trigger_event('core.modify_notification_message', compact($vars))); + $this->subject = $subject; + $this->msg = $message; + unset($subject, $message); + // Parse message through template $this->msg = trim($this->template->assign_display('body')); |