diff --git a/module/dev/model.php b/module/dev/model.php index 12f19a617b..07dd8e0cf2 100644 --- a/module/dev/model.php +++ b/module/dev/model.php @@ -512,6 +512,10 @@ class devModel extends model */ public function loadDefaultLang($language = 'zh-cn', $module = 'common') { + if(empty($language)) $language = 'zh-cn'; + if(empty($module)) $module = 'common'; + if($module != 'common' and !isset($this->defaultLang)) return null; + $clientLang = $this->app->clientLang; if($language and $language != $clientLang) $this->app->clientLang = $language; diff --git a/test/model/dev/loaddefaultlang.php b/test/model/dev/loaddefaultlang.php new file mode 100644 index 0000000000..7beb64f721 --- /dev/null +++ b/test/model/dev/loaddefaultlang.php @@ -0,0 +1,25 @@ +#!/usr/bin/env php +> $URCOMMON +检查传入common的情况 >> $PRODUCTCOMMON +检查传入project的情况 >> 0 + +*/ + + +$moduleList = array('common', 'project'); + +global $tester; +$tester->loadModel('dev'); +r($tester->dev->loadDefaultLang()) && p('URCommon') && e('$URCOMMON'); // 检查没有传值的情况 +r($tester->dev->loadDefaultLang('zh-cn', $moduleList[0])) && p('productCommon') && e('$PRODUCTCOMMON'); // 检查传入common的情况 +r($tester->dev->loadDefaultLang('zh-cn', $moduleList[1])) && p() && e('0'); // 检查传入project的情况