Fix on quoted printable encoding on email subject line

qcodo · Jul 31, 2010 · 763b428 · 763b428
1 parent c10a6e6
commit 763b428
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/includes/qcodo/_core/framework/QEmailServer.class.php b/includes/qcodo/_core/framework/QEmailServer.class.php
@@ -569,7 +569,11 @@ public function CalculateMessageHeaderAndBody($strEncodingType = null, QDateTime
 			if (!$strEncodingType) $strEncodingType = QApplication::$EncodingType;
 
 			// Additional "Optional" Headers
-			if ($this->Subject) $this->SetHeader('Subject', sprintf("=?%s?Q?%s?=", $strEncodingType, self::QuotedPrintableEncode($this->Subject)));
+			if ($this->Subject) {
+				$strSubject = self::QuotedPrintableEncode($this->Subject);
+				$strSubject = str_replace('?', '=3F', $strSubject);
+				$this->SetHeader('Subject', sprintf("=?%s?Q?%s?=", $strEncodingType, $strSubject));
+			}
 			if ($this->Cc) $this->SetHeader('Cc', $this->Cc);
 
 			// Setup for MIME and Content Encoding