mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-06 23:02:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

规范调整

Browse Source
This commit is contained in:
thinkphp
2015-10-03 21:43:48 +08:00
parent 7c2bcbcff2
commit 1cfb3704c6
31 changed files with 393 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/think/lang.php
View File

@@ -28,7 +28,7 @@ class Lang {
* @return mixed
*/
static public function set($name, $value=null,$range='') {
$range = $range?$range:self::$range;
$range = $range? $range : self::$range;
// 批量定义
if (is_array($name)){
return self::$lang[$range] = array_merge(self::$lang[$range], array_change_key_case($name));
@@ -46,8 +46,9 @@ class Lang {
static public function get($name=null, $range='') {
$range = $range?$range:self::$range;
// 空参数返回所有定义
if (empty($name))
if (empty($name)){
return self::$lang[$range];
}
$name = strtolower($name);
return isset(self::$lang[$range][$name]) ? self::$lang[$range][$name] : $name;
}