From b6386d8ca12eeffee298eea439a8311f981709d9 Mon Sep 17 00:00:00 2001 From: Pratik Joshi Date: Fri, 21 Jun 2013 19:56:27 +0530 Subject: [PATCH] CRM-12804 fix : add any missing settings at the end of final upgrade --- CRM/Upgrade/Form.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php index 7ec91adfbe..38d4504cc2 100644 --- a/CRM/Upgrade/Form.php +++ b/CRM/Upgrade/Form.php @@ -604,10 +604,6 @@ SET version = '$version' $config = CRM_Core_Config::singleton(); $config->userSystem->flush(); - - if (version_compare($currentVer, '4.1.alpha1') >= 0) { - CRM_Core_BAO_Setting::updateSettingsFromMetaData(); - } return TRUE; } @@ -623,6 +619,10 @@ SET version = '$version' $params = array(); CRM_Core_BAO_ConfigSetting::add($params); + // CRM-12804 comment-51411 : add any missing settings + // at the end of upgrade + CRM_Core_BAO_Setting::updateSettingsFromMetaData(); + // cleanup caches CRM-8739 $config = CRM_Core_Config::singleton(); $config->cleanupCaches(1); -- 2.25.1