Changeset 38374

Timestamp:

08/26/2016 05:52:05 PM (8 years ago)

Author:

wonderboymusic

Message:

Load: remove class-feed.php (There is no class named Feed or WP_Feed, it just loads other classes) and, instead, move the require calls to the only place they are ever included: inside fetch_feed(). This simplifies the include path.

Tested with this feed in a widget: http://rss.nytimes.com/services/xml/rss/nyt/HomePage.xml.

See #36335.

Location:

trunk/src

Files:

• wp-admin/includes/update-core.php (modified) (1 diff)
• wp-includes/class-feed.php (deleted)
• wp-includes/feed.php (modified) (2 diffs)

trunk/src/wp-admin/includes/update-core.php

@@ -707 +707 @@
 'wp-admin/includes/class-wp-automatic-upgrader.php', // Wrong file name, see #37628.
 // 4.7
+'wp-includes/class-feed.php',
 'wp-includes/locale.php',
 'wp-includes/session.php',

trunk/src/wp-includes/feed.php

@@ -664 +664 @@
  */
 function fetch_feed( $url ) {
-    require_once( ABSPATH . WPINC . '/class-feed.php' );
+    if ( ! class_exists( 'SimplePie', false ) ) {
+        require_once( ABSPATH . WPINC . '/class-simplepie.php' );
+    }
+    require_once( ABSPATH . WPINC . '/class-wp-feed-cache.php' );
+    require_once( ABSPATH . WPINC . '/class-wp-feed-cache-transient.php' );
+    require_once( ABSPATH . WPINC . '/class-wp-simplepie-file.php' );
+    require_once( ABSPATH . WPINC . '/class-wp-simplepie-sanitize-kses.php' );
 
     $feed = new SimplePie();
@@ -677 +683 @@
 
     $feed->set_feed_url( $url );
-    /** This filter is documented in wp-includes/class-feed.php */
+    /** This filter is documented in wp-includes/class-wp-feed-cache-transient.php */
     $feed->set_cache_duration( apply_filters( 'wp_feed_cache_transient_lifetime', 12 * HOUR_IN_SECONDS, $url ) );
     /**