[eGroupWare-svn] r56015 - /trunk/preferences/inc/class.preferences_hooks.inc.php

Author: nathangray
Date: Wed May  4 18:51:29 2016
New Revision: 56015

URL: http://svn.stylite.de/viewvc/egroupware?rev=56015&view=rev
Log:
Provide a default country even if not in setup

Modified:
    trunk/preferences/inc/class.preferences_hooks.inc.php

Modified: trunk/preferences/inc/class.preferences_hooks.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/preferences/inc/class.preferences_hooks.inc.php?rev=56015&r1=56014&r2=56015&view=diff
==============================================================================
--- trunk/preferences/inc/class.preferences_hooks.inc.php (original)
+++ trunk/preferences/inc/class.preferences_hooks.inc.php Wed May  4 18:51:29 2016
@@ -94,10 +94,11 @@
 		{
 			$lang = setup::get_lang();
 			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
 		if (!isset($GLOBALS['egw_setup']) &&
 			substr($GLOBALS['egw_info']['user']['preferences']['common']['rte_font_size'], -2) == 'px')


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z