[Phpbb-checkins] r10052 - /branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Tue Aug 25 10:04:38 2009
New Revision: 10052

Log:
Fix possible wrong encodings in email template files in messenger. Related to bug #46725

Modified:
    branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php

Modified: branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php Tue Aug 25 10:04:38 2009
***************
*** 268,273 ****
--- 268,276 ----
  		// 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 = '';