From 3ff76d21be0654c311444b98a9a24c51a9985f40 Mon Sep 17 00:00:00 2001
From: warlee <824691958@qq.com>
Date: Tue, 31 Mar 2015 12:29:36 +0800
Subject: [PATCH] =?UTF-8?q?v3.12=20=E8=8F=9C=E5=8D=95=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ChangeLog.md                 | 4 ++++
 config/version.php           | 2 +-
 controller/setting.class.php | 9 ++++++++-
 controller/util.php          | 9 ++++++++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 551f95c..3a68ca0 100755
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+###ver3.12 `2015/3/31`
+-----
+####update:
+ - 兼容ie中文，导致菜单保存丢失问题
 
 ###ver3.11 `2015/3/30`
 -----
diff --git a/config/version.php b/config/version.php
index 5f8f83a..7a6c136 100755
--- a/config/version.php
+++ b/config/version.php
@@ -1,2 +1,2 @@
 <?php 
-define('KOD_VERSION','3.11');
\ No newline at end of file
+define('KOD_VERSION','3.12');
\ No newline at end of file
diff --git a/controller/setting.class.php b/controller/setting.class.php
index 56f0f6a..611347a 100755
--- a/controller/setting.class.php
+++ b/controller/setting.class.php
@@ -33,6 +33,9 @@ class setting extends Controller{
     }
     public function get_setting(){
         $setting = $GLOBALS['config']['setting_system']['menu'];
+        if (!$setting) {
+            $setting = $this->config['setting_menu_default'];
+        }
         show_json($setting);
     }
 
@@ -46,7 +49,11 @@ class setting extends Controller{
         }
         $setting = $GLOBALS['config']['setting_system'];
         foreach ($data as $key => $value){
-            $setting[$key] = rawurldecode($value);
+            if ($key=='menu') {
+                $setting[$key] = $value;
+            }else{
+                $setting[$key] = rawurldecode($value);
+            }
         }
         //$setting['menu'] = $GLOBALS['config']['setting_menu_default'];
         //为了保存更多的数据；不直接覆盖文件 $data->setting_file;
diff --git a/controller/util.php b/controller/util.php
index 75030fd..3d79ace 100755
--- a/controller/util.php
+++ b/controller/util.php
@@ -168,7 +168,14 @@ function init_setting(){
         fileCache::save($setting_file,$setting);
     }else{
         $setting = fileCache::load($setting_file);   
-    }     
+    }
+    if (!is_array($setting)) {
+        $setting = $GLOBALS['config']['setting_system_default'];
+    }
+    if (!is_array($setting['menu'])) {
+        $setting['menu'] = $GLOBALS['config']['setting_menu_default'];
+    }
+
     $GLOBALS['app']->setDefaultController($setting['first_in']);//设置默认控制器
     $GLOBALS['app']->setDefaultAction('index');    //设置默认控制器函数