diff options
Diffstat (limited to 'phpBB/includes/emailer.php')
| -rwxr-xr-x | phpBB/includes/emailer.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php index eceaaca492..d9e5fba2e4 100755 --- a/phpBB/includes/emailer.php +++ b/phpBB/includes/emailer.php @@ -73,11 +73,7 @@ class emailer // function set_subject($subject = '') { - $match = array(); - preg_match("/^(Subject:(.*?)[\r\n]+?)?(.*?)$/is", $this->msg, $match); - - $this->msg = ( isset($match[3]) ) ? trim($match[3]) : ""; - $this->subject = ( $subject != '' ) ? $subject : trim($match[2]); + $this->subject = $subject; } // @@ -167,6 +163,16 @@ class emailer eval("\$this->msg = \"$this->msg\";"); + // + // We now try and pull a subject from the email body ... if it exists, + // do this here because the subject may contain a variable + // + $match = array(); + preg_match("/^(Subject:(.*?)[\r\n]+?)?(.*?)$/is", $this->msg, $match); + + $this->msg = ( isset($match[3]) ) ? trim($match[3]) : ""; + $this->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]); + return TRUE; } |