makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Forgot to default charset and subject when no match found - Matthijs

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3325 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-01-15 13:31:53 +00:00
parent e4886c6d01
commit 31d2fc7d63
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/emailer.php
View file

@ -160,12 +160,20 @@ class emailer
$this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : 'No Subject'); $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : 'No Subject');
$drop_header .= '[\r\n]*?' . phpbb_preg_quote($match[1], '#'); $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)) if (preg_match('#^(Charset:(.*?))$#m', $this->msg, $match))
{ {
$this->encoding = (trim($match[2]) != '') ? trim($match[2]) : trim($lang['ENCODING']); $this->encoding = (trim($match[2]) != '') ? trim($match[2]) : trim($lang['ENCODING']);
$drop_header .= '[\r\n]*?' . phpbb_preg_quote($match[1], '#'); $drop_header .= '[\r\n]*?' . phpbb_preg_quote($match[1], '#');
} }
else
{
$this->encoding = trim($lang['ENCODING']);
}
if ($drop_header != '') if ($drop_header != '')
{ {