Get the default language from database not from current viewing language

Conflicts:
	CRM/Core/BAO/ConfigSetting.php

diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php
index 7925db8b09f39131f2d7dfa33e742e0221797515..bcfd3014fd31411d7bf3baace777748ca6588698 100644 (file)
--- 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}" : '';