From: Tim Otten <to-git@think.hm>
Date: Tue, 26 Aug 2014 21:44:07 +0000 (-0700)
Subject: Revert "CRM-15156 - Clear cms resource cache during upgrade"
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e83f30bdd1a124525e40f7ce48b291f35ca4b668;p=civicrm-core.git

Revert "CRM-15156 - Clear cms resource cache during upgrade"
---

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 876284a388..b1f0df1c90 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -436,8 +436,6 @@ class CRM_Core_Resources {
 
   public function resetCacheCode() {
     $this->setCacheCode(CRM_Utils_String::createRandom(5, CRM_Utils_String::ALPHANUMERIC));
-    // Also flush cms resource cache if needed
-    CRM_Core_Config::singleton()->userSystem->clearResourceCache();
   }
 
   /**
diff --git a/CRM/Utils/System/Base.php b/CRM/Utils/System/Base.php
index e52558d3b7..a92882a41d 100644
--- a/CRM/Utils/System/Base.php
+++ b/CRM/Utils/System/Base.php
@@ -183,13 +183,6 @@ abstract class CRM_Utils_System_Base {
     // nullop by default
   }
 
-  /**
-   * Flush css/js caches
-   */
-  function clearResourceCache() {
-    // nullop by default
-  }
-
   /**
    * Return default Site Settings
    *
diff --git a/CRM/Utils/System/DrupalBase.php b/CRM/Utils/System/DrupalBase.php
index 3fc5054e03..7452ab8c7b 100644
--- a/CRM/Utils/System/DrupalBase.php
+++ b/CRM/Utils/System/DrupalBase.php
@@ -283,11 +283,4 @@ abstract class CRM_Utils_System_DrupalBase extends CRM_Utils_System_Base {
       watchdog('civicrm', $message, NULL, WATCHDOG_DEBUG);
     }
   }
-
-  /**
-   * Flush css/js caches
-   */
-  function clearResourceCache() {
-    _drupal_flush_css_js();
-  }
 }