From 3471ea4b30be04e0efdc5074769f165b53b9737c Mon Sep 17 00:00:00 2001 From: samuelsov Date: Thu, 25 Sep 2014 17:49:27 -0400 Subject: [PATCH] Get the default language from database not from current viewing language Conflicts: CRM/Core/BAO/ConfigSetting.php --- CRM/Core/BAO/ConfigSetting.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php index 7925db8b09..bcfd3014fd 100644 --- a/CRM/Core/BAO/ConfigSetting.php +++ b/CRM/Core/BAO/ConfigSetting.php @@ -318,14 +318,8 @@ class CRM_Core_BAO_ConfigSetting { } } - if ($lcMessages) { - // update config lcMessages - CRM-5027 fixed. - $defaults['lcMessages'] = $lcMessages; - } - else { - // if a single-lang site or the above didn't yield a result, use default - $lcMessages = CRM_Utils_Array::value('lcMessages', $defaults); - } + // if a single-lang site or the above didn't yield a result, use default + $lcMessages = CRM_Utils_Array::value( 'lcMessages', $defaults ); // set suffix for table names - use views if more than one language $dbLocale = $multiLang ? "_{$lcMessages}" : ''; -- 2.25.1