From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 28 Sep 2014 01:13:20 +0000 (-0400)
Subject: Remove old unnecessary hack from upgrade script
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cb0a87861e494ddc1aa83a740330973629bdf538;p=civicrm-core.git

Remove old unnecessary hack from upgrade script
---

diff --git a/CRM/Upgrade/Page/Upgrade.php b/CRM/Upgrade/Page/Upgrade.php
index f3386177df..b9c0d34b0e 100644
--- a/CRM/Upgrade/Page/Upgrade.php
+++ b/CRM/Upgrade/Page/Upgrade.php
@@ -89,20 +89,12 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page {
       CRM_Core_Error::fatal($error);
     }
 
+    $config = CRM_Core_Config::singleton();
+
     // All cached content needs to be cleared because the civi codebase was just replaced
     CRM_Core_Resources::singleton()->flushStrings()->rebuildDynamicResources();
-
-    // This could be removed in later rev
-    if ($currentVer == '2.1.6') {
-      $config = CRM_Core_Config::singleton();
-      // also cleanup the templates_c directory
-      $config->cleanupCaches();
-    } else {
-      $config = CRM_Core_Config::singleton();
-      // cleanup only the templates_c directory
-      $config->cleanup(1, FALSE);
-    }
-    // end of hack
+    // cleanup only the templates_c directory
+    $config->cleanup(1, FALSE);
 
     $preUpgradeMessage = NULL;
     $upgrade->setPreUpgradeMessage($preUpgradeMessage, $currentVer, $latestVer);
@@ -120,7 +112,6 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page {
     }
 
     $template->assign('preUpgradeMessage', $preUpgradeMessage);
-    // $template->assign( 'message', $postUpgradeMessage );
 
     $content = $template->fetch('CRM/common/success.tpl');
     echo CRM_Utils_System::theme($content, $this->_print, TRUE);
@@ -138,12 +129,6 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page {
     }
 
     $config = CRM_Core_Config::singleton();
-    // This could be removed in later rev
-    if ($currentVer == '2.1.6') {
-      // also cleanup the templates_c directory
-      $config->cleanupCaches();
-    }
-    // end of hack
 
     $postUpgradeMessage = '<span class="bold">' . ts('Congratulations! Your upgrade was successful! (... wasn\'t that easy!)') . '</span>';