- Cache system improvements by Gerhard: removed some left-overs.

includes/common.inc

@@ -745,7 +745,7 @@ function page_set_cache() {
 
   if (!$user->uid && $_SERVER["REQUEST_METHOD"] == "GET") {
     if ($data = ob_get_contents()) {
-      cache_set(request_uri(), $data, (time() + variable_get("cache_clear", 120)));
+      cache_set(request_uri(), $data, 1);
     }
   }
 }

modules/archive.module

@@ -150,7 +150,7 @@ function archive_calendar($original = 0) {
 
   $output .= "</table></div>\n\n";
 
-  cache_set("archive:calendar:$start_of_month", $output, time() + variable_get("cache_clear", 120));
+  cache_set("archive:calendar:$start_of_month", $output, 1);
 
   return $output;
 }

modules/archive/archive.module

@@ -150,7 +150,7 @@ function archive_calendar($original = 0) {
 
   $output .= "</table></div>\n\n";
 
-  cache_set("archive:calendar:$start_of_month", $output, time() + variable_get("cache_clear", 120));
+  cache_set("archive:calendar:$start_of_month", $output, 1);
 
   return $output;
 }

modules/forum.module

@@ -95,7 +95,7 @@ function forum_block($op = "list", $delta = 0) {
           $content .= "<div id=\"forum_more\" style=\"text-align: right;\">". l(t("more"), "forum", array("title" => t("Read the latest forum topics."))) ."</div>";
         }
 
-        cache_set("forum:block", $content, time() + variable_get("cache_clear", 120));
+        cache_set("forum:block", $content, 1);
       }
       else {
         $content = $cache->data;
@@ -321,7 +321,7 @@ function forum_get_forums($tid = 0) {
       $n++;
     }
 
-    cache_set("forum:$tid", serialize($forums), time() + variable_get("cache_clear", 120));
+    cache_set("forum:$tid", serialize($forums), 1);
   }
   else {
     $forums = unserialize($cache->data);

modules/forum/forum.module

@@ -95,7 +95,7 @@ function forum_block($op = "list", $delta = 0) {
           $content .= "<div id=\"forum_more\" style=\"text-align: right;\">". l(t("more"), "forum", array("title" => t("Read the latest forum topics."))) ."</div>";
         }
 
-        cache_set("forum:block", $content, time() + variable_get("cache_clear", 120));
+        cache_set("forum:block", $content, 1);
       }
       else {
         $content = $cache->data;
@@ -321,7 +321,7 @@ function forum_get_forums($tid = 0) {
       $n++;
     }
 
-    cache_set("forum:$tid", serialize($forums), time() + variable_get("cache_clear", 120));
+    cache_set("forum:$tid", serialize($forums), 1);
   }
   else {
     $forums = unserialize($cache->data);