Merge branch 'master' of https://github.com/liu21st/think

2026-07-05 22:52:49 +08:00 · 2015-12-08 18:29:25 +08:00
parent 3cf65dd413 4db4a228a2
commit 393629d61c
4 changed files with 14 additions and 4 deletions
--- a/library/think/lang.php
+++ b/library/think/lang.php
@@ -59,6 +59,9 @@ class Lang
            self::$lang[$range] = [];
        }
        // 批量定义
+        if(!isset(self::$lang[$range])) {
+            self::$lang[$range] = [];
+        }
        return self::$lang[$range] = array_merge(self::$lang[$range], array_change_key_case($lang));
    }