Changeset 61056

Timestamp:

10/24/2025 03:30:35 AM (10 months ago)

Author:

westonruter

Message:

General: Improve resilience of feed_links_extra() when global $post is not set.

This obtains the global post via get_queried_object() when is_singular().

Developed in ​https://github.com/WordPress/wordpress-develop/pull/10401

Props westonruter, johnjamesjacoby, Presskopp, abcd95, dilipbheda, sabernhardt, awetz583, indirabiswas27.
Fixes #63263.

Location:

trunk

Files:

• src/wp-includes/general-template.php (modified) (2 diffs)
• tests/phpunit/tests/general/feedLinksExtra.php (modified) (1 diff)

trunk/src/wp-includes/general-template.php

@@ -3327 +3327 @@
         $args = apply_filters( 'feed_links_extra_args', $args );
 
-        if ( is_singular() ) {
-                $id   = 0;
-                $post = get_post( $id );
+        $queried_object = get_queried_object();
+        if ( is_singular() && $queried_object instanceof WP_Post ) {
+                $post = $queried_object;
 
                 /** This filter is documented in wp-includes/general-template.php */
@@ -3349 +3349 @@
                 $show_post_comments_feed = apply_filters( 'feed_links_extra_show_post_comments_feed', $show_comments_feed );
 
-                if ( $show_post_comments_feed && ( comments_open() || pings_open() || $post->comment_count > 0 ) ) {
+                if ( $show_post_comments_feed && ( comments_open( $post ) || pings_open( $post ) || (int) $post->comment_count > 0 ) ) {
                         $title = sprintf(
                                 $args['singletitle'],
                                 get_bloginfo( 'name' ),
                                 $args['separator'],
-                                the_title_attribute( array( 'echo' => false ) )
+                                the_title_attribute(
+                                        array(
+                                                'echo' => false,
+                                                'post' => $post,
+                                        )
+                                )
                         );
 

trunk/tests/phpunit/tests/general/feedLinksExtra.php

@@ -635 +635 @@
                 );
         }
+
+        /**
+         * @ticket 63263
+         */
+        public function test_feed_links_extra_should_work_fail_if_global_post_empty() {
+                $post_id = self::factory()->post->create();
+                $this->go_to( get_permalink( $post_id ) );
+                $GLOBALS['post'] = null;
+
+                $this->assertNotEmpty( get_echo( 'feed_links_extra' ) );
+        }
 }