Changeset 49565

Timestamp:

11/12/2020 02:34:33 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Feeds: Register transient feed cache handler using the recommended method for SimplePie 1.3 or later.

This fixes a "Non-static method cannot be called statically" fatal error when calling fetch_feed() on PHP 8.

Follow-up to [21644], [21652], [22366], [22599].

Props dd32, afragen, Senning, markoheijnen, ComputerGuru, useStrict, Ipstenu, nacin, l3rady, HoaSi, NathanAtmoz, fabifott, jfoulquier, thefarlilacfield, subscriptiongroup, rogerlos, Mte90, mopsyd, dossy, stulab, MadtownLems, roikles, justlevine, joostdevalk, OptimizingMatters, hellofromTonya, bph, ayeshrajans, SergeyBiryukov.
Fixes #29204.

Location:

trunk/src/wp-includes

Files:

• class-wp-feed-cache.php (modified) (1 diff)
• feed.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-feed-cache.php

@@ -6 +6 @@
  * @subpackage Feed
  * @since 4.7.0
+
  */
+
+
+
+
+
+
+
 
 /**

trunk/src/wp-includes/feed.php

@@ -790 +790 @@
     }
 
-    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';
@@ -802 +801 @@
     $feed->sanitize = new WP_SimplePie_Sanitize_KSES();
 
-    $feed->set_cache_class( 'WP_Feed_Cache' );
+    // Register the cache handler using the recommended method for SimplePie 1.3 or later.
+    if ( method_exists( 'SimplePie_Cache', 'register' ) ) {
+        SimplePie_Cache::register( 'wp_transient', 'WP_Feed_Cache_Transient' );
+        $feed->set_cache_location( 'wp_transient' );
+    } else {
+        // Back-compat for SimplePie 1.2.x.
+        require_once ABSPATH . WPINC . '/class-wp-feed-cache.php';
+        $feed->set_cache_class( 'WP_Feed_Cache' );
+    }
+
     $feed->set_file_class( 'WP_SimplePie_File' );