mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-06 15:45:34 +02:00
Fix possible wrong encodings in email template files in messenger. Related to bug #46725
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10052 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
03568fd176
commit
19bae65f4c
@ -268,6 +268,9 @@ class messenger
|
|||||||
// Parse message through template
|
// Parse message through template
|
||||||
$this->msg = trim($this->tpl_obj->assign_display('body'));
|
$this->msg = trim($this->tpl_obj->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);
|
||||||
|
|
||||||
// We now try and pull a subject from the email body ... if it exists,
|
// We now try and pull a subject from the email body ... if it exists,
|
||||||
// do this here because the subject may contain a variable
|
// do this here because the subject may contain a variable
|
||||||
$drop_header = '';
|
$drop_header = '';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user