mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-04 07:47:34 +02:00
Code Issues Releases Wiki Activity

apply patch for apparent issue with \r\n feedbacks on charset line in template

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@2717 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2002-07-19 14:37:58 +00:00
parent a001b7762a
commit db45c0c0df
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/emailer.php
View File

@@ -147,7 +147,7 @@ class emailer
// do this here because the subject may contain a variable // do this here because the subject may contain a variable
// //
$match = array(); $match = array();
preg_match("/^(Subject:(.*?)[\r\n]+?)?(Charset:(.*?)[\r\n]+?)?(.*?)$/is", $this->msg, $match); preg_match("/^(Subject:(.*?)(?:\r\n)+?)?(Charset:(.*?)(?:\r\n)+?)?(.*?)$/is", $this->msg, $match);
$this->msg = ( isset($match[5]) ) ? trim($match[5]) : ''; $this->msg = ( isset($match[5]) ) ? trim($match[5]) : '';
$this->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]); $this->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]);