Changeset 22599

Timestamp:

11/15/2012 09:51:02 AM (14 years ago)

Author:

nacin

Message:

Remove SimplePie 1.2/1.3 compatibility code no longer needed with 1.3.1. see #22321. 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');
 
-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);
-                }
+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

@@ -529 +529 @@
         $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_cache_class( 'WP_Feed_Cache' );
+        $feed->set_file_class( 'WP_SimplePie_File' );
 
         $feed->set_feed_url($url);