From: Samuel Vanhove <samuel@koumbit.org>
Date: Mon, 22 Jul 2013 20:16:30 +0000 (-0400)
Subject: Remove specific code for upgrade from 2.0 to 2.1
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2332519af01b20e8cfef486283a41ddbf19106bc;p=civicrm-core.git

Remove specific code for upgrade from 2.0 to 2.1
---

diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php
index 7864add6b3..2929a53893 100644
--- a/CRM/Core/BAO/ConfigSetting.php
+++ b/CRM/Core/BAO/ConfigSetting.php
@@ -236,16 +236,6 @@ class CRM_Core_BAO_ConfigSetting {
         }
       }
 
-      // since language field won't be present before upgrade.
-      if (CRM_Core_Config::isUpgradeMode()) {
-        // dont add if its empty
-        if (!empty($defaults)) {
-          // retrieve directory and url preferences also
-          CRM_Core_BAO_Setting::retrieveDirectoryAndURLPreferences($defaults);
-        }
-        return;
-      }
-
       // check if there are any locale strings
       if ($domain->locale_custom_strings) {
         $defaults['localeCustomStrings'] = unserialize($domain->locale_custom_strings);