Ticket #11585: 11585.diff

wp-includes/class-simplepie.php

@@ -1541 +1541 @@
                                 $this->data = array();
                         }
                 }
+
                 // If we don't already have the file (it'll only exist if we've opened it to check if the cache has been modified), open it.
                 if (!isset($file))
                 {
@@ -1553 +1554 @@
                                 $headers = array(
                                         'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
                                 );
+
                                 $file = $this->registry->create('File', array($this->feed_url, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen));
                         }
                 }
@@ -1560 +1562 @@
                 if (!$file->success && !($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
                 {
                         $this->error = $file->error;
+                        $this->cache_results( $cache, $this->feed_url );
                         return !empty($this->data);
                 }
 
@@ -1578 +1581 @@
                                         {
                                                 $this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or " . SIMPLEPIE_NAME . " was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
                                                 $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
+                                                $this->cache_results( $cache, $this->feed_url );
                                                 return false;
                                         }
                                 }
@@ -1586 +1590 @@
                                         // This is usually because DOMDocument doesn't exist
                                         $this->error = $e->getMessage();
                                         $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, $e->getFile(), $e->getLine()));
+                                        $this->cache_results( $cache, $this->feed_url );
                                         return false;
                                 }
-                                if ($cache)
-                                {
-                                        $this->data = array('url' => $this->feed_url, 'feed_url' => $file->url, 'build' => SIMPLEPIE_BUILD);
-                                        if (!$cache->save($this))
-                                        {
-                                                trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
-                                        }
-                                        $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc'));
-                                }
+
+                                $this->cache_results( $cache, $file->url );
                                 $this->feed_url = $file->url;
                         }
                         $locate = null;
@@ -1611 +1609 @@
                 return array($headers, $sniffed);
         }
 
+
         /**
+         * Cache the results of the feed request.
+         *
+         * @param SimplePie_Cache|false $cache Cache handler, or false to not load from the cache
+         * @param string $feedurl
+         */
+        public function cache_results( &$cache, $feedurl )
+        {
+                if ($cache)
+                {
+                        $this->data = array('url' => $this->feed_url, 'build' => SIMPLEPIE_BUILD);
+
+                        // A weird little hack to ensure that we cache errors.
+                        if (empty($this->error))
+                        {
+                                $this->data['feed_url'] = $feedurl;
+                        }
+
+                        if (!$cache->save($this))
+                        {
+                                trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
+                        }
+
+                        $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $feedurl), 'spc'));
+                }
+        }
+
+        /**
          * Get the error message for the occured error
          *
          * @return string|array Error message, or array of messages for multifeeds