WordPress.org

Make WordPress Core

Changeset 22599


Ignore:
Timestamp:
11/15/12 09:51:02 (2 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/class-feed.php

    r22330 r22599  
    44    require_once (ABSPATH . WPINC . '/class-simplepie.php'); 
    55 
    6 if ( version_compare( SIMPLEPIE_VERSION, '1.3-dev', '>' ) ) : 
    7     SimplePie_Cache::register( 'wp-transient', 'WP_Feed_Cache_Transient' ); 
    8 else : 
    9     class WP_Feed_Cache extends SimplePie_Cache { 
    10         /** 
    11          * Create a new SimplePie_Cache object 
    12          * 
    13          * @static 
    14          * @access public 
    15          */ 
    16         function create($location, $filename, $extension) { 
    17             return new WP_Feed_Cache_Transient($location, $filename, $extension); 
    18         } 
     6class WP_Feed_Cache extends SimplePie_Cache { 
     7    /** 
     8     * Create a new SimplePie_Cache object 
     9     * 
     10     * @static 
     11     * @access public 
     12     */ 
     13    function create($location, $filename, $extension) { 
     14        return new WP_Feed_Cache_Transient($location, $filename, $extension); 
    1915    } 
    20 endif; 
     16} 
    2117 
    2218class WP_Feed_Cache_Transient { 
  • trunk/wp-includes/feed.php

    r21996 r22599  
    529529    $feed = new SimplePie(); 
    530530 
    531     if ( version_compare( SIMPLEPIE_VERSION, '1.3-dev', '>' ) ) { 
    532         $feed->set_cache_location( 'wp-transient' ); 
    533         $feed->registry->register( 'Cache', 'WP_Feed_Cache_Transient' ); 
    534         $feed->registry->register( 'File', 'WP_SimplePie_File' ); 
    535     } else { 
    536         $feed->set_cache_class( 'WP_Feed_Cache' ); 
    537         $feed->set_file_class( 'WP_SimplePie_File' ); 
    538     } 
     531    $feed->set_cache_class( 'WP_Feed_Cache' ); 
     532    $feed->set_file_class( 'WP_SimplePie_File' ); 
    539533 
    540534    $feed->set_feed_url($url); 
Note: See TracChangeset for help on using the changeset viewer.