Ticket #29204: 29204.3.diff

wp-includes/class-wp-feed-cache.php

@@ -14 +14 @@
  *
  * @see SimplePie_Cache
  */
-class WP_Feed_Cache extends SimplePie_Cache {
+class WP_Feed_Cache {
 
         /**
          * Creates a new SimplePie_Cache object.
@@ -26 +26 @@
          * @param string $extension 'spi' or 'spc'.
          * @return WP_Feed_Cache_Transient Feed cache handler object that uses transients.
          */
-        public function create( $location, $filename, $extension ) {
+        public static function create( $location, $filename, $extension ) {
                 return new WP_Feed_Cache_Transient( $location, $filename, $extension );
         }
 }

wp-includes/feed.php

@@ -801 +801 @@
         // constructor sets it before we have a chance to set the sanitization class.
         $feed->sanitize = new WP_SimplePie_Sanitize_KSES();
 
+        SimplePie_Cache::register( 'wp_transient', 'WP_Feed_Cache_Transient' );
+        $feed->set_cache_location( 'wp_transient://' . $url );
         $feed->set_cache_class( 'WP_Feed_Cache' );
         $feed->set_file_class( 'WP_SimplePie_File' );