From 8ef8eacf235c0b46bcb92fe5a92bbb6e31fefdd0 Mon Sep 17 00:00:00 2001 From: jitendrapurohit Date: Mon, 21 Dec 2015 11:25:22 +0530 Subject: [PATCH] additional fixes --- CRM/Core/BAO/ConfigSetting.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php index a3c4c0a37b..4f239044c7 100644 --- 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); } } -- 2.25.1