* add ignore for iconv.

2014-11-25 10:40:19 +08:00
parent a8766c858f
commit f22b980c23
1 changed files with 1 additions and 1 deletions
@@ -375,7 +375,7 @@ class mailModel extends model
     */
    public function convertCharset($string)
    {
-        if($this->config->mail->smtp->charset != strtolower($this->config->charset)) return iconv($this->config->charset, $this->config->mail->smtp->charset, $string);
+        if($this->config->mail->smtp->charset != strtolower($this->config->charset)) return iconv($this->config->charset, $this->config->mail->smtp->charset . '//IGNORE', $string);
        return $string;
    }