aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorOliver Schramm <oliver.schramm97@gmail.com>2018-10-05 21:45:56 +0200
committerOliver Schramm <oliver.schramm97@gmail.com>2018-10-24 00:42:10 +0200
commit5b25b3e2d59558c7a933195fb404597a64a85cbd (patch)
tree72e672b4363a4de1ff67ff51f512929a9dcb23cb /phpBB/includes
parentae6c3b0d34c662f107fb7cb8d9e26e5bd252a3b3 (diff)
downloadforums-5b25b3e2d59558c7a933195fb404597a64a85cbd.tar
forums-5b25b3e2d59558c7a933195fb404597a64a85cbd.tar.gz
forums-5b25b3e2d59558c7a933195fb404597a64a85cbd.tar.bz2
forums-5b25b3e2d59558c7a933195fb404597a64a85cbd.tar.xz
forums-5b25b3e2d59558c7a933195fb404597a64a85cbd.zip
[ticket/15830] Move event to a more useful place
PHPBB3-15830
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_messenger.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 75c15657b0..b5c8baada6 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -325,6 +325,9 @@ class messenger
'SITENAME' => htmlspecialchars_decode($config['sitename']),
));
+ // Parse message through template
+ $this->msg = trim($this->template->assign_display('body'));
+
$subject = $this->subject;
$message = $this->msg;
$template = $this->template;
@@ -353,9 +356,6 @@ class messenger
$this->msg = $message;
unset($subject, $message);
- // Parse message through template
- $this->msg = trim($this->template->assign_display('body'));
-
// Because we use \n for newlines in the body message we need to fix line encoding errors for those admins who uploaded email template files in the wrong encoding
$this->msg = str_replace("\r\n", "\n", $this->msg);