Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust for load lang from db.

Browse Source
This commit is contained in:
azhi
2013-08-07 15:48:55 +08:00
parent aebe854ad9
commit ea739d600b
6 changed files with 49 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/router.class.php
+5 -6
View File
@@ -1465,15 +1465,14 @@ class router
}
/* Merge from the db lang. */
if($moduleName != 'common' and isset($lang->db->custom))
if($moduleName != 'common' and isset($lang->db->custom[$moduleName]))
{
foreach($lang->db->custom as $record)
foreach($lang->db->custom[$moduleName] as $section => $fields)
{
if($moduleName == $record->module)
foreach($fields as $key => $value)
{
if(!$record->key) continue;
unset($lang->{$record->module}->{$record->section}[$record->key]);
$lang->{$record->module}->{$record->section}[$record->key] = $record->value;
unset($lang->{$moduleName}->{$section}[$key]);
$lang->{$moduleName}->{$section}[$key] = $value;
}
}
}