From 709b1f25d03bcfc497939208650f247ddde6b2e5 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Thu, 15 Nov 2012 09:51:02 +0000
Subject: [PATCH] Remove SimplePie 1.2/1.3 compatibility code no longer needed
 with 1.3.1. see #22321. see #21183.

git-svn-id: https://develop.svn.wordpress.org/trunk@22599 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/class-feed.php | 24 ++++++++++--------------
 wp-includes/feed.php       | 10 ++--------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/wp-includes/class-feed.php b/wp-includes/class-feed.php
index 14eabb3b83..a60955de29 100644
--- a/wp-includes/class-feed.php
+++ b/wp-includes/class-feed.php
@@ -3,21 +3,17 @@
 if ( !class_exists('SimplePie') )
 	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 {
 	var $name;
diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index f40b489f8d..262acd727f 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -528,14 +528,8 @@ function fetch_feed($url) {
 
 	$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);
 	$feed->set_cache_duration( apply_filters( 'wp_feed_cache_transient_lifetime', 12 * HOUR_IN_SECONDS, $url ) );