From 52c2beecbe381be231de4e6dd8bc1496f5118212 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Sun, 5 May 2013 00:22:53 +0000
Subject: [PATCH]  * code for task#1259.

---
 module/mail/control.php        | 1 +
 module/mail/model.php          | 1 +
 module/mail/view/edit.html.php | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/mail/control.php b/module/mail/control.php
index 8cb0090239..f1542e67b8 100755
--- a/module/mail/control.php
+++ b/module/mail/control.php
@@ -68,6 +68,7 @@ class mail extends control
             $mailConfig = $this->config->mail->smtp;
             $mailConfig->fromAddress = $this->config->mail->fromAddress;
             $mailConfig->fromName    = $this->config->mail->fromName;
+            $mailConfig->charset     = zget($mailConfig, 'charset', 'utf-8');
         }
         elseif($this->session->mailConfig)
         {
diff --git a/module/mail/model.php b/module/mail/model.php
index eb7a0eee1c..3c79e2323c 100644
--- a/module/mail/model.php
+++ b/module/mail/model.php
@@ -53,6 +53,7 @@ class mailModel extends model
         $config->fromName = 'zentao';
         $config->password = '';
         $config->debug    = 1;
+        $config->charset  = 'utf-8';
         if(!isset($config->host)) $config->host = '';
         if(!isset($config->auth)) $config->auth = 1;
         if(!isset($config->port)) $config->port = '25';
diff --git a/module/mail/view/edit.html.php b/module/mail/view/edit.html.php
index 183ed34e2f..978e3e318f 100755
--- a/module/mail/view/edit.html.php
+++ b/module/mail/view/edit.html.php
@@ -56,7 +56,7 @@ include '../../common/view/header.html.php';
   </tr>
   <tr>
     <th class='rowhead'><?php echo $lang->mail->charset; ?></th>
-    <td><?php echo html::radio('charset', $config->charsets[$this->cookie->lang], zget($config->charsets[$this->cookie->lang], $mailConfig->charset, 'utf-8', $mailConfig->charset));?></td>
+    <td><?php echo html::radio('charset', $config->charsets[$this->cookie->lang], $mailConfig->charset);?></td>
   </tr>
 
   <tr>