makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15830] Move event to a more useful place

Browse source 
PHPBB3-15830
This commit is contained in:
Oliver Schramm 2018-10-05 21:45:56 +02:00
parent ae6c3b0d34
commit 5b25b3e2d5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/functions_messenger.php
View file

@ -325,6 +325,9 @@ class messenger
'SITENAME' => htmlspecialchars_decode($config['sitename']), 'SITENAME' => htmlspecialchars_decode($config['sitename']),
)); ));
// Parse message through template
$this->msg = trim($this->template->assign_display('body'));
$subject = $this->subject; $subject = $this->subject;
$message = $this->msg; $message = $this->msg;
$template = $this->template; $template = $this->template;
@ -353,9 +356,6 @@ class messenger
$this->msg = $message; $this->msg = $message;
unset($subject, $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 // 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); $this->msg = str_replace("\r\n", "\n", $this->msg);