From db45c0c0df89f87cb56241f8bcb6dca558311b2e Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Fri, 19 Jul 2002 14:37:58 +0000 Subject: [PATCH] apply patch for apparent issue with \r\n feedbacks on charset line in template git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@2717 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/emailer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php index 641f0f21ce..10d22f2822 100755 --- a/phpBB/includes/emailer.php +++ b/phpBB/includes/emailer.php @@ -147,7 +147,7 @@ class emailer // do this here because the subject may contain a variable // $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->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]);