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 b9c0d34b0e2c374e2c08f4295d789e139b28ee7d..6c37f52c1d5c6f29e57e7999c300796d0a4e97fc 100644 (file)
--- a/CRM/Upgrade/Page/Upgrade.php
+++ b/CRM/Upgrade/Page/Upgrade.php
@@ -92,9 +92,20 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page {
     $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();
-    // cleanup only the templates_c directory
-    $config->cleanup(1, FALSE);
+    CRM_Core_Resources::singleton()->flushStrings()->resetCacheCode();
+    CRM_Core_Menu::store();
+
+    // 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
 
     $preUpgradeMessage = NULL;
     $upgrade->setPreUpgradeMessage($preUpgradeMessage, $currentVer, $latestVer);