extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-02 20:19:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Provide a default country even if not in setup

Browse Source
This commit is contained in:
Nathan Gray 2016-05-04 16:51:29 +00:00
parent b408d9fa1d
commit 74f232a1b1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
preferences/inc/class.preferences_hooks.inc.php
View File

@ -94,10 +94,11 @@ class preferences_hooks
{ {
$lang = setup::get_lang(); $lang = setup::get_lang();
if (empty($lang)) $lang = 'en'; if (empty($lang)) $lang = 'en';
list(,$country) = explode('-',$lang);
if (empty($country)) $country = Locale::getRegion(Locale::getDefault());
if (empty($country)) $country = 'de';
} }
list(,$country) = explode('-',$lang);
if (empty($country)) $country = Locale::getRegion(Locale::getDefault());
if (empty($country)) $country = 'de';
// check for old rte_font_size pref including px and split it in size and unit // check for old rte_font_size pref including px and split it in size and unit
if (!isset($GLOBALS['egw_setup']) && if (!isset($GLOBALS['egw_setup']) &&
substr($GLOBALS['egw_info']['user']['preferences']['common']['rte_font_size'], -2) == 'px') substr($GLOBALS['egw_info']['user']['preferences']['common']['rte_font_size'], -2) == 'px')