Ticket #1103: crude_rss_cache_fix.patch

wp-includes/rss-functions.php

@@ -10 +10 @@
 define('RSS', 'RSS');
 define('ATOM', 'Atom');
 define('MAGPIE_USER_AGENT', 'WordPress/' . $wp_version);
+define('MAGPIE_CACHE_ON',true);
+define('MAGPIE_CACHE_DIR',ABSPATH . "wp-content/cache");
+define('MAGPIE_CACHE_AGE',86400);
 
 class MagpieRSS { 
         var $parser;
@@ -664 +667 @@
                 
                 update_option($cache_option, $rss);
                 update_option($cache_timestamp, time() );
-                
-                return $cache_option;
+                $cache_file = $this->file_name( $url );
+                $fp = @fopen( $cache_file, 'w' );
+                if ( ! $fp ) {
+                        $this->error("Cache unable to open file for writing: $cache_file");
+                        return 0;
+                }
+                $data = $this->serialize( $rss );                                                                      
+                fwrite( $fp, $data );                                                                                  
+                fclose( $fp );                                                                                              
+                return $cache_file;
         }
         
 /*=======================================================================*\
@@ -676 +687 @@
 \*=======================================================================*/     
         function get ($url) {
                 $this->ERROR = "";
-                $cache_option = 'rss_' . $this->file_name( $url );
-                
-                if ( ! get_option( $cache_option ) ) {
-                        $this->debug( 
-                                "Cache doesn't contain: $url (cache option: $cache_option)"
-                        );
-                        return 0;
+                $cache_file = $this->file_name( $url );
+            
+                if ( ! file_exists( $cache_file ) ) {
+                    $this->debug("Cache doesn't contain: $url (cache file: $cache_file)");
+                    return 0;
                 }
-                
-                $rss = get_option( $cache_option );
-                
+            
+                $fp = @fopen($cache_file, 'r');
+                if ( ! $fp ) {
+                    $this->error("Failed to open cache file for reading: $cache_file");
+                    return 0;
+                }
+
+                $data = fread( $fp, filesize($cache_file) );
+                $rss = $this->unserialize( $data );
+        
                 return $rss;
         }
 
@@ -701 +717 @@
                 $this->ERROR = "";
                 $cache_option = $this->file_name( $url );
                 $cache_timestamp = 'rss_' . $this->file_name( $url ) . '_ts';
+                $filename = $this->file_name( $url );
 
-                if ( $mtime = get_option($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
-                                return 'HIT';
-                        }
-                        else {
-                                // object exists but is old
-                                return 'STALE';
-                        }
+                if ( file_exists( $filename ) ) {
+                    // find how long ago the file was added to the cache
+                    // and whether that is longer then MAX_AGE
+                    $mtime = filemtime( $filename );
+                    $age = time() - $mtime;
+                    if ( $this->MAX_AGE > $age ) {
+                        // object exists and is current
+                        return 'HIT';
+                    }
+                    else {
+                        // object exists but is old
+                        return 'STALE';
+                    }
                 }
                 else {
-                        // object does not exist
-                        return 'MISS';
+                    // object does not exist
+                    return 'MISS';
                 }
         }
 
@@ -742 +760 @@
         Output:         a file name
 \*=======================================================================*/             
         function file_name ($url) {
-                return md5( $url );
+                $filename = md5( $url );
+                return join( DIRECTORY_SEPARATOR, array( $this->BASE_CACHE, $filename ) );
         }
         
 /*=======================================================================*\
@@ -847 +866 @@
                 return false;
         }
 }
-?>
- No newline at end of file
+?>