From 45992a638a85374bf0df1084b3657c845abec060 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Mar 2012 07:58:02 +0100
Subject: [PATCH] fixed mailprefix handling
---
inc/Mailer.class.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/inc/Mailer.class.php b/inc/Mailer.class.php
index 7e6889292..5a5e7f2c6 100644
--- a/inc/Mailer.class.php
+++ b/inc/Mailer.class.php
@@ -500,7 +500,7 @@ class Mailer {
}
}
- if(isset($subject)){
+ if(isset($this->headers['Subject'])){
// add prefix to subject
if(empty($conf['mailprefix'])){
if(utf8_strlen($conf['title']) < 20) {
@@ -512,17 +512,17 @@ class Mailer {
$prefix = '['.$conf['mailprefix'].']';
}
$len = strlen($prefix);
- if(substr($this->headers['subject'],0,$len) != $prefix){
- $this->headers['subject'] = $prefix.' '.$this->headers['subject'];
+ if(substr($this->headers['Subject'],0,$len) != $prefix){
+ $this->headers['Subject'] = $prefix.' '.$this->headers['Subject'];
}
// encode subject
if(defined('MAILHEADER_ASCIIONLY')){
- $this->headers['subject'] = utf8_deaccent($this->headers['subject']);
- $this->headers['subject'] = utf8_strip($this->headers['subject']);
+ $this->headers['Subject'] = utf8_deaccent($this->headers['Subject']);
+ $this->headers['Subject'] = utf8_strip($this->headers['Subject']);
}
if(!utf8_isASCII($this->headers['Subject'])){
- $subject = '=?UTF-8?B?'.base64_encode($this->headers['Subject']).'?=';
+ $this->headers['Subject'] = '=?UTF-8?B?'.base64_encode($this->headers['Subject']).'?=';
}
}
--
GitLab