From f22b980c2310043cc72b7743994cb320bd4e8f83 Mon Sep 17 00:00:00 2001
From: xia0ta0 <xia0ta0@outlook.com>
Date: Tue, 25 Nov 2014 10:40:19 +0800
Subject: [PATCH]  * add ignore for iconv.

---
 module/mail/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/mail/model.php b/module/mail/model.php
index eb8a8b3403..79e4c6f426 100644
--- a/module/mail/model.php
+++ b/module/mail/model.php
@@ -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;
     }