From 9d5ce51cfdd2807ad96a0b1d1742786e1bc046c2 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Wed, 8 Jan 2003 11:26:52 +0000 Subject: [PATCH] This one may even work ... git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3275 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/emailer.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php index 58da71464f..fd7075c97f 100755 --- a/phpBB/includes/emailer.php +++ b/phpBB/includes/emailer.php @@ -158,18 +158,18 @@ class emailer if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match)) { $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : 'No Subject'); - $drop_header .= '[\r\n]*?' . $match[1]; + $drop_header .= '[\r\n]*?' . phpbb_preg_quote($match[1], '#'); } if (preg_match('#^(Charset:(.*?))$#m', $this->msg, $match)) { $this->encoding = (trim($match[2]) != '') ? trim($match[2]) : trim($lang['ENCODING']); - $drop_header .= '[\r\n]*?' . $match[1]; + $drop_header .= '[\r\n]*?' . phpbb_preg_quote($match[1], '#'); } if ($drop_header != '') { - $this->msg = trim(preg_replace('#' . phpbb_preg_quote($drop_header, '#') . '#s', '', $this->msg)); + $this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg)); } return true;