From a1593ab1c90a9433f6e9b4ae0eab8f3ccdaab40d Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 16 Aug 2009 18:39:45 +0000
Subject: - Patch #370454 by chx, Damien Tournoud: simplify page caching.

---
 modules/system/system.admin.inc | 15 ---------------
 modules/system/system.install   | 11 +++++++++++
 2 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'modules/system')

diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index cf2270937..84de67946 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1363,21 +1363,6 @@ function system_performance_settings() {
   );
 
   $cache = variable_get('cache', CACHE_DISABLED);
-  $js_hide = $cache != CACHE_AGGRESSIVE ? 'js-hide' : '';
-  $problem_modules = array_unique(array_merge(module_implements('boot'), module_implements('exit')));
-  if (count($problem_modules) > 0) {
-    $module_names = array();
-    foreach ($problem_modules as $module) {
-      $info = drupal_parse_info_file(drupal_get_path('module', $module) . "/$module.info");
-      $module_names[] = $info['name'];
-    }
-    sort($module_names);
-    $message = format_plural(count($module_names), '%module may cause issues when using aggressive caching.', '%modules may cause issues when using aggressive caching.', array('%module' => $module_names[0], '%modules' => implode(', ', $module_names)));
-    $description = ' <strong id="cache-error" class="error ' . $js_hide . '">' . $message . '</strong>';
-  }
-  else {
-    $description = ' <strong class="' . $js_hide . '">' . t('Note: if you use aggressive page caching and enable new modules, you will need to check this setting again to ensure compatibility.') . '</strong>';
-  }
   $form['caching']['cache'] = array(
     '#type' => 'radios',
     '#title' => t('Page cache for anonymous users'),
diff --git a/modules/system/system.install b/modules/system/system.install
index 784f09776..16d7c6b73 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -2242,6 +2242,17 @@ function system_update_7032() {
   return $ret;
 }
 
+/**
+ * Move CACHE_AGGRESSIVE to CACHE_NORMAL.
+ */
+function system_update_7033() {
+  if (variable_get('cache') == 2) {
+    variable_set('cache', CACHE_NORMAL);
+    $ret[] = array('success' => TRUE, 'query' => "Aggressive caching was disabled and replaced with normal caching, please read the page caching section in default.settings.php for more information on how to enable similar functionality.");
+  }
+  return array();
+}
+
 /**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
-- 
cgit v1.2.3