From 31d2fc7d6365951af83cb7d48ffc0a5e0fe3b89b Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Wed, 15 Jan 2003 13:31:53 +0000 Subject: [PATCH] Forgot to default charset and subject when no match found - Matthijs git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3325 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/emailer.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php index fd7075c97f..b8c0314faf 100755 --- a/phpBB/includes/emailer.php +++ b/phpBB/includes/emailer.php @@ -160,12 +160,20 @@ class emailer $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : 'No Subject'); $drop_header .= '[\r\n]*?' . phpbb_preg_quote($match[1], '#'); } + else + { + $this->subject = (($this->subject != '') ? $this->subject : 'No Subject'); + } if (preg_match('#^(Charset:(.*?))$#m', $this->msg, $match)) { $this->encoding = (trim($match[2]) != '') ? trim($match[2]) : trim($lang['ENCODING']); $drop_header .= '[\r\n]*?' . phpbb_preg_quote($match[1], '#'); } + else + { + $this->encoding = trim($lang['ENCODING']); + } if ($drop_header != '') {