Merge pull request #1213 from yashodha/4.3.CRM-12451

[civicrm-core.git] / CRM / Upgrade / Form.php

diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php
index 7ec91adfbe580c1678cfa8b308957841cab1f71d..38d4504cc24af3ec32f2c4ac37829ddae471d0cd 100644 (file)
--- 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);