WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove SimplePie 1.2/1.3 compatibility code no longer needed with 1.3.1. see #22321. see #21183. 

git-svn-id: http://core.svn.wordpress.org/trunk@22599 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2012-11-15 09:51:02 +00:00
parent 1889d7de3b
commit dfeced9fd1
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/class-feed.php
View File

@ -3,10 +3,7 @@
if ( !class_exists('SimplePie') ) if ( !class_exists('SimplePie') )
require_once (ABSPATH . WPINC . '/class-simplepie.php'); require_once (ABSPATH . WPINC . '/class-simplepie.php');
if ( version_compare( SIMPLEPIE_VERSION, '1.3-dev', '>' ) ) : class WP_Feed_Cache extends SimplePie_Cache {
SimplePie_Cache::register( 'wp-transient', 'WP_Feed_Cache_Transient' );
else :
class WP_Feed_Cache extends SimplePie_Cache {
/** /**
* Create a new SimplePie_Cache object * Create a new SimplePie_Cache object
* *
@ -16,8 +13,7 @@ else :
function create($location, $filename, $extension) { function create($location, $filename, $extension) {
return new WP_Feed_Cache_Transient($location, $filename, $extension); return new WP_Feed_Cache_Transient($location, $filename, $extension);
} }
} }
endif;
class WP_Feed_Cache_Transient { class WP_Feed_Cache_Transient {
var $name; var $name;

6
wp-includes/feed.php
View File

@ -528,14 +528,8 @@ function fetch_feed($url) {
$feed = new SimplePie(); $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_cache_class( 'WP_Feed_Cache' );
$feed->set_file_class( 'WP_SimplePie_File' ); $feed->set_file_class( 'WP_SimplePie_File' );
}
$feed->set_feed_url($url); $feed->set_feed_url($url);
$feed->set_cache_duration( apply_filters( 'wp_feed_cache_transient_lifetime', 12 * HOUR_IN_SECONDS, $url ) ); $feed->set_cache_duration( apply_filters( 'wp_feed_cache_transient_lifetime', 12 * HOUR_IN_SECONDS, $url ) );