diff options
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 6 |
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); |