From 74f232a1b18055d81daf8c4748c4673be3a21712 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 4 May 2016 16:51:29 +0000
Subject: [PATCH] Provide a default country even if not in setup

---
 preferences/inc/class.preferences_hooks.inc.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/preferences/inc/class.preferences_hooks.inc.php b/preferences/inc/class.preferences_hooks.inc.php
index 1c919cc63b..5a3a207d47 100644
--- a/preferences/inc/class.preferences_hooks.inc.php
+++ b/preferences/inc/class.preferences_hooks.inc.php
@@ -94,10 +94,11 @@ class preferences_hooks
 		{
 			$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')