Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-14-11-24-52

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

diff --git a/CRM/Upgrade/Page/Upgrade.php b/CRM/Upgrade/Page/Upgrade.php
index f7f7bd2c4f88c35c52ecb6bcecb84e2d37321490..6c37f52c1d5c6f29e57e7999c300796d0a4e97fc 100644 (file)
--- a/CRM/Upgrade/Page/Upgrade.php
+++ b/CRM/Upgrade/Page/Upgrade.php
@@ -89,6 +89,8 @@ 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()->resetCacheCode();
     CRM_Core_Menu::store();
@@ -121,7 +123,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);
@@ -139,12 +140,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>';