viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-07-01 08:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/4.2.6'

Browse Source
This commit is contained in:
yuri
2016-09-20 15:58:34 +03:00
parent a75534e32a 8862fd279e
commit 340af18beb
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/Espo/Core/Utils/Language.php
View File

@@ -183,6 +183,11 @@ class Language
$options = $this->get($scope. '.options.' . $field);
if (is_array($options) && array_key_exists($value, $options)) {
return $options[$value];
} else if ($scope !== 'Global') {
$options = $this->get('Global.options.' . $field);
if (is_array($options) && array_key_exists($value, $options)) {
return $options[$value];
}
}
return $value;
}