Changeset 48114

Timestamp:

06/21/2020 10:34:35 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Posts, Post Types: Avoid a PHP warning when get_the_content() is called outside of the loop.

This ensures that $pages and other globals are only used after they have been set up in setup_postdata().

Follow-up to [44941].

Props tessawatkinsllc, dontdream, spacedmonkey, squarecandy, davidbaumwald, SergeyBiryukov.
Fixes #47824. See #42814.

Location:

trunk

Files:

• src/wp-includes/class-wp-query.php (modified) (1 diff)
• src/wp-includes/post-template.php (modified) (1 diff)
• tests/phpunit/tests/post/getTheContent.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-query.php

@@ -4276 +4276 @@
 
                 /**
-                 * Fires once the post data has been setup.
+                 * Fires once the post data has been set up.
                  *
                  * @since 2.8.0

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

@@ -283 +283 @@
         }
 
-        if ( null === $post ) {
+        // Use the globals if the $post parameter was not specified,
+        // but only after they have been set up in setup_postdata().
+        if ( null === $post && did_action( 'the_post' ) ) {
                 $elements = compact( 'page', 'more', 'preview', 'pages', 'multipage' );
         } else {

trunk/tests/phpunit/tests/post/getTheContent.php

@@ -76 +76 @@
                 $this->assertSame( 'Bang', $found );
         }
+
+        /**
+         * @ticket 47824
+         */
+        public function test_should_fall_back_to_post_global_outside_of_the_loop() {
+                $GLOBALS['post'] = self::factory()->post->create( array( 'post_content' => 'Foo' ) );
+
+                $this->assertSame( 'Foo', get_the_content() );
+        }
 }