编辑器更新，此版本还有bug，暂不要更新使用

内核更新
2016-10-12 15:35:02 +08:00
parent 8d1600a2eb
commit e70d287e89
103 changed files with 31476 additions and 175 deletions
--- a/core/library/think/Lang.php
+++ b/core/library/think/Lang.php
@@ -83,7 +83,9 @@ class Lang
                // 记录加载信息
                App::$debug && Log::record('[ LANG ] ' . $_file, 'info');
                $_lang = include $_file;
-                $lang  = array_change_key_case($_lang) + $lang;
+                if (is_array($_lang)) {
+                    $lang = array_change_key_case($_lang) + $lang;
+                }
            }
        }
        if (!empty($lang)) {