additional fixes

diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php
index a3c4c0a37b49c83c9d06fee06caa5d9148cfc13a..4f239044c793920a4674e54c8d571b7721339b7a 100644 (file)
--- a/CRM/Core/BAO/ConfigSetting.php
+++ b/CRM/Core/BAO/ConfigSetting.php
@@ -99,6 +99,9 @@ class CRM_Core_BAO_ConfigSetting {
     if ($isUpgrade && CRM_Core_DAO::checkFieldExists('civicrm_domain', 'config_backend')) {
       $domain->selectAdd('config_backend');
     }
+    else {
+      $domain->selectAdd('locales');
+    }
 
     $domain->id = CRM_Core_Config::domainID();
     $domain->find(TRUE);
@@ -115,10 +118,9 @@ class CRM_Core_BAO_ConfigSetting {
           unset($defaults[$skip]);
         }
       }
-
-      if (!$isUpgrade) {
-        CRM_Core_BAO_ConfigSetting::applyLocale(Civi::settings($domain->id), $domain->locales);
-      }
+    }
+    if (!$isUpgrade) {
+      CRM_Core_BAO_ConfigSetting::applyLocale(Civi::settings($domain->id), $domain->locales);
     }
   }