Changeset 10603

Timestamp:

02/20/2009 02:23:11 AM (12 years ago)

Author:

ryan

Message:

Add expiration for transients

Location:

trunk/wp-includes

Files:

• functions.php (modified) (2 diffs)
• rss.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -666 +666 @@
     } else {
         $transient_option = '_transient_' . $wpdb->escape($transient);
+        // If option is not in alloptions, it is not autoloaded and thus has a timeout
+        $alloptions = wp_load_alloptions();
+        if ( !isset( $alloptions[$transient_option] ) ) {
+            $transient_timeout = '_transient_timeout_' . $wpdb->escape($transient);
+            if ( get_option($transient_timeout) > time() ) {
+                delete_option($transient_option);
+                delete_option($transient_timeout);
+                return false;
+            }
+        }
+
         $value = get_option($transient_option);
     }
@@ -684 +695 @@
  * @param string $transient Transient name. Expected to not be SQL-escaped
  * @param mixed $value Transient value.
+ * @param int $expiration Time until expiration in seconds, default 0
  * @return bool False if value was not set and true if value was set.
  */
-function set_transient($transient, $value) {
+function set_transient($transient, $value, $expiration = 0) {
     global $_wp_using_ext_object_cache, $wpdb;
 
     if ( $_wp_using_ext_object_cache ) {
-        return wp_cache_set($transient, $value, 'transient');
+        return wp_cache_set($transient, $value, 'transient', $expiration);
     } else {
+        $transient_timeout = '_transient_timeout_' . $transient;
         $transient = '_transient_' . $transient;
         $safe_transient = $wpdb->escape($transient);
-        if ( false === get_option( $safe_transient ) )
-            return add_option($transient, $value, '', 'no');
-        else
+        if ( false === get_option( $safe_transient ) ) {
+            $autoload = 'yes';
+            if ( 0 != $expiration ) {
+                $autoload = 'no'; 
+                add_option($transient_timeout, time() + $expiration, '', 'no');
+            }
+            return add_option($transient, $value, '', $autoload);
+        } else {
+            if ( 0 != $expiration )
+                update_option($transient_timeout, time() + $expiration);
             return update_option($transient, $value);
+        }
     }
 }

trunk/wp-includes/rss.php

@@ -713 +713 @@
         global $wpdb;
         $cache_option = 'rss_' . $this->file_name( $url );
-        $cache_timestamp = 'rss_' . $this->file_name( $url ) . '_ts';
-
-        set_transient($cache_option, $rss);
-        set_transient($cache_timestamp, time() );
+
+        set_transient($cache_option, $rss, $this->MAX_AGE);
 
         return $cache_option;
@@ -750 +748 @@
     function check_cache ( $url ) {
         $this->ERROR = "";
-        $cache_option = $this->file_name( $url );
-        $cache_timestamp = 'rss_' . $this->file_name( $url ) . '_ts';
-
-        if ( $mtime = get_transient($cache_timestamp) ) {
-            // find how long ago the file was added to the cache
-            // and whether that is longer then MAX_AGE
-            $age = time() - $mtime;
-            if ( $this->MAX_AGE > $age ) {
-                // object exists and is current
+        $cache_option = 'rss_' . $this->file_name( $url );
+
+        if ( get_transient($cache_option) ) {
+            // object exists and is current
                 return 'HIT';
-            }
-            else {
-                // object exists but is old
-                return 'STALE';
-            }
-        }
-        else {
+        } else {
             // object does not exist
             return 'MISS';