Changeset 21652

Timestamp:

08/29/2012 12:25:52 AM (12 years ago)

Author:

nacin

Message:

Stabilize how WordPress hooks into SimplePie to implement transient caching.

Since a plugin can load a previous (< 1.3) version of SimplePie before we do,
we need to be compatible with our old method of overriding SimplePie_Cache::create().

SimplePie_Cache::create() was converted to static in 1.3 (as it was called),
requiring that we create two different definitions of WP_Feed_Cache (extends
SimplePie_Cache). Instead, we can use 1.3's new object registry, and leave
the old WP_Feed_Cache to SimplePie 1.2 versions.

see #21183.

Location:

trunk/wp-includes

Files:

• class-feed.php (modified) (1 diff)
• feed.php (modified) (1 diff)

trunk/wp-includes/class-feed.php

@@ -4 +4 @@
     require_once (ABSPATH . WPINC . '/class-simplepie.php');
 
-class WP_Feed_Cache extends SimplePie_Cache {
-    /**
-     * Create a new SimplePie_Cache object
-     *
-     * @static
-     * @access public
-     */
-    public static function create($location, $filename, $extension) {
-        return new WP_Feed_Cache_Transient($location, $filename, $extension);
+if ( version_compare( SIMPLEPIE_VERSION, '1.3-dev', '>' ) ) :
+    SimplePie_Cache::register( 'wp-transient', 'WP_Feed_Cache_Transient' );
+else :
+    class WP_Feed_Cache extends SimplePie_Cache {
+        /**
+         * Create a new SimplePie_Cache object
+         *
+         * @static
+         * @access public
+         */
+        function create($location, $filename, $extension) {
+            return new WP_Feed_Cache_Transient($location, $filename, $extension);
+        }
     }
-}
+endif;
 
 class WP_Feed_Cache_Transient {

trunk/wp-includes/feed.php

@@ -533 +533 @@
 
     $feed = new SimplePie();
+
+    if ( version_compare( SIMPLEPIE_VERSION, '1.3-dev', '>' ) ) {
+        $feed->set_cache_location( 'wp-transient' );
+        $feed->registry->register( 'Cache', 'WP_Feed_Cache_Transient' );
+        $feed->registry->register( 'File', 'WP_SimplePie_File' );
+    } else {
+        $feed->set_cache_class( 'WP_Feed_Cache' );
+        $feed->set_file_class( 'WP_SimplePie_File' );
+    }
+
     $feed->set_feed_url($url);
-    $feed->set_cache_class('WP_Feed_Cache');
-    $feed->set_file_class('WP_SimplePie_File');
     $feed->set_cache_duration(apply_filters('wp_feed_cache_transient_lifetime', 43200, $url));
     do_action_ref_array( 'wp_feed_options', array( &$feed, $url ) );