Avoid double-encoding subject if mbstring overloads mail function, fixes

PHPMailer#133
adatapost · Nov 11, 2013 · 024c4f3 · 024c4f3
1 parent 6730be8
commit 024c4f3
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -602,10 +602,16 @@ public function __destruct()
      */
     private function mailPassthru($to, $subject, $body, $header, $params)
     {
+        //Check overloading of mail function to avoid double-encoding
+        if (ini_get('mbstring.func_overload') & 1) {
+            $subject = $this->secureHeader($subject);
+        } else {
+            $subject = $this->encodeHeader($this->secureHeader($subject));
+        }
         if (ini_get('safe_mode') || !($this->UseSendmailOptions)) {
-            $rt = @mail($to, $this->encodeHeader($this->secureHeader($subject)), $body, $header);
+            $rt = @mail($to, $subject, $body, $header);
         } else {
-            $rt = @mail($to, $this->encodeHeader($this->secureHeader($subject)), $body, $header, $params);
+            $rt = @mail($to, $subject, $body, $header, $params);
         }
         return $rt;
     }