From 747859fedaf0370fdbd5bcd7fd83164a61f3a3ec Mon Sep 17 00:00:00 2001 From: jitendrapurohit Date: Fri, 18 Dec 2015 12:06:38 +0530 Subject: [PATCH] CRM-17714 - DB Error after upgradation to 4.7 beta3 --- CRM/Core/BAO/ConfigSetting.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php index 561c086f56..a3c4c0a37b 100644 --- a/CRM/Core/BAO/ConfigSetting.php +++ b/CRM/Core/BAO/ConfigSetting.php @@ -88,6 +88,7 @@ class CRM_Core_BAO_ConfigSetting { */ public static function retrieve(&$defaults) { $domain = new CRM_Core_DAO_Domain(); + $isUpgrade = CRM_Core_Config::isUpgradeMode(); //we are initializing config, really can't use, CRM-7863 $urlVar = 'q'; @@ -95,12 +96,9 @@ class CRM_Core_BAO_ConfigSetting { $urlVar = 'task'; } - if (CRM_Core_Config::isUpgradeMode()) { + if ($isUpgrade && CRM_Core_DAO::checkFieldExists('civicrm_domain', 'config_backend')) { $domain->selectAdd('config_backend'); } - else { - $domain->selectAdd('config_backend, locales'); - } $domain->id = CRM_Core_Config::domainID(); $domain->find(TRUE); @@ -118,7 +116,9 @@ class CRM_Core_BAO_ConfigSetting { } } - 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