diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-08-25 09:04:38 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-08-25 09:04:38 +0000 |
| commit | 19bae65f4c79c7f50d71fd57bfff6ff1033ed84b (patch) | |
| tree | fbe57f63cf8f7e6c921c71793bffb94d8f1df6ac /phpBB/includes/functions_messenger.php | |
| parent | 03568fd176501c6a6c629590ab701eadef5841aa (diff) | |
| download | forums-19bae65f4c79c7f50d71fd57bfff6ff1033ed84b.tar forums-19bae65f4c79c7f50d71fd57bfff6ff1033ed84b.tar.gz forums-19bae65f4c79c7f50d71fd57bfff6ff1033ed84b.tar.bz2 forums-19bae65f4c79c7f50d71fd57bfff6ff1033ed84b.tar.xz forums-19bae65f4c79c7f50d71fd57bfff6ff1033ed84b.zip | |
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
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 847b2e0c46..0fcf33f999 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -268,6 +268,9 @@ class messenger // Parse message through template $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, // do this here because the subject may contain a variable $drop_header = ''; |