Bläddra i källkod

[ZF-9483] Zend_Mail

- charset handling in construct

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22470 44c647ce-9c0f-0410-b52a-842ac1e357ba
renanbr 15 år sedan
förälder
incheckning
bcebaba476
1 ändrade filer med 7 tillägg och 4 borttagningar
  1. 7 4
      library/Zend/Mail.php

+ 7 - 4
library/Zend/Mail.php

@@ -77,7 +77,7 @@ class Zend_Mail extends Zend_Mime_Message
      * Mail character set
      * @var string
      */
-    protected $_charset = null;
+    protected $_charset = 'iso-8859-1';
 
     /**
      * Mail headers
@@ -208,11 +208,14 @@ class Zend_Mail extends Zend_Mime_Message
     /**
      * Public constructor
      *
-     * @param string $charset
+     * @param  string $charset
+     * @return void
      */
-    public function __construct($charset = 'iso-8859-1')
+    public function __construct($charset = null)
     {
-        $this->_charset = $charset;
+        if (!is_null($charset)) {
+            $this->_charset = $charset;
+        }
     }
 
     /**