Ticket #42814: 42814.6.diff

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

@@ -4155 +4155 @@
                         return;
                 }
 
+                $elements = $this->generate_postdata( $post );
+                if ( false === $elements ) {
+                        return;
+                }
+
+                $id           = $elements['id'];
+                $authordata   = $elements['authordata'];
+                $currentday   = $elements['currentday'];
+                $currentmonth = $elements['currentmonth'];
+                $page         = $elements['page'];
+                $pages        = $elements['pages'];
+                $multipage    = $elements['multipage'];
+                $more         = $elements['more'];
+                $numpages     = $elements['numpages'];
+
+                return true;
+        }
+
+        /**
+         * Generate post data.
+         *
+         * @since 5.2.0
+         *
+         * @param WP_Post|object|int $post WP_Post instance or Post ID/object.
+         * @return array|bool  $elements Elements of post or false on failure.
+         */
+        public function generate_postdata( $post ) {
+
+                if ( ! ( $post instanceof WP_Post ) ) {
+                        $post = get_post( $post );
+                }
+
+                if ( ! $post ) {
+                        return false;
+                }
+
                 $id = (int) $post->ID;
 
                 $authordata = get_userdata( $post->post_author );
@@ -4235 +4271 @@
                  */
                 do_action_ref_array( 'the_post', array( &$post, &$this ) );
 
-                return true;
+                $elements = compact( 'id','authordata', 'currentday', 'currentmonth', 'page', 'pages', 'multipage', 'more', 'numpages' );
+
+                return $elements;
         }
         /**
          * After looping through a nested query, this function

src/wp-includes/default-filters.php

@@ -182 +182 @@
 add_filter( 'the_excerpt', 'convert_chars' );
 add_filter( 'the_excerpt', 'wpautop' );
 add_filter( 'the_excerpt', 'shortcode_unautop' );
-add_filter( 'get_the_excerpt', 'wp_trim_excerpt' );
+add_filter( 'get_the_excerpt', 'wp_trim_excerpt', 10, 2 );
 
 add_filter( 'the_post_thumbnail_caption', 'wptexturize' );
 add_filter( 'the_post_thumbnail_caption', 'convert_smilies' );

src/wp-includes/formatting.php

@@ -3676 +3676 @@
  * The ' […]' string can be modified by plugins/themes using the {@see 'excerpt_more'} filter
  *
  * @since 1.5.0
+ * @since 5.2.0 Added '$post' param
  *
  * @param string $text Optional. The excerpt. If set to empty, an excerpt is generated.
+ * @param WP_Post|object|int $post Optional. WP_Post instance or Post ID/object. Default is null.
  * @return string The excerpt.
  */
-function wp_trim_excerpt( $text = '' ) {
+function wp_trim_excerpt( $text = '', $post = null ) {
         $raw_excerpt = $text;
         if ( '' == $text ) {
-                $text = get_the_content( '' );
+            $post = get_post( $post );
+                $text = get_the_content( '', false, $post );
 
                 $text = strip_shortcodes( $text );
                 $text = excerpt_remove_blocks( $text );

src/wp-includes/post-template.php

@@ -253 +253 @@
  * Retrieve the post content.
  *
  * @since 0.71
+ * @since 5.2.0 Added `$post` parameter.
  *
  * @global int   $page      Page number of a single post/page.
  * @global int   $more      Boolean indicator for whether single post/page is being viewed.
@@ -263 +264 @@
  *
  * @param string $more_link_text Optional. Content for when there is more text.
  * @param bool   $strip_teaser   Optional. Strip teaser content before the more text. Default is false.
+ * @param WP_Post|object|int $post Optional. WP_Post instance or Post ID/object. Default is null.
  * @return string
  */
-function get_the_content( $more_link_text = null, $strip_teaser = false ) {
+function get_the_content( $more_link_text = null, $strip_teaser = false, $post = null ) {
         global $page, $more, $preview, $pages, $multipage;
 
-        $post = get_post();
+        $_post = get_post( $post );
+
+        if ( ! ( $_post instanceof WP_Post ) ) {
+                return '';
+        }
+
+        if ( null === $post ) {
+                $elements = compact( 'page', 'more', 'preview', 'pages', 'multipage' );
+        } else {
+                $elements = generate_postdata( $_post );
+        }
+
 
         if ( null === $more_link_text ) {
                 $more_link_text = sprintf(
@@ -276 +289 @@
                         sprintf(
                                 /* translators: %s: Name of current post */
                                 __( 'Continue reading %s' ),
-                                the_title_attribute( array( 'echo' => false ) )
+                                the_title_attribute( array( 'echo' => false, 'post' => $_post, ) )
                         ),
                         __( '(more…)' )
                 );
@@ -286 +299 @@
         $has_teaser = false;
 
         // If post password required and it doesn't match the cookie.
-        if ( post_password_required( $post ) ) {
-                return get_the_password_form( $post );
+        if ( post_password_required( $_post ) ) {
+                return get_the_password_form( $_post );
         }
 
-        if ( $page > count( $pages ) ) { // if the requested page doesn't exist
-                $page = count( $pages ); // give them the highest numbered page that DOES exist
+        if ( $elements['page'] > count( $elements['pages'] ) ) { // if the requested page doesn't exist
+                $elements['page'] = count( $elements['pages'] ); // give them the highest numbered page that DOES exist
         }
 
-        $content = $pages[ $page - 1 ];
+        $content = $elements['pages'][ $elements['page'] - 1 ];
         if ( preg_match( '/<!--more(.*?)?-->/', $content, $matches ) ) {
                 $content = explode( $matches[0], $content, 2 );
                 if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) ) {
@@ -306 +319 @@
                 $content = array( $content );
         }
 
-        if ( false !== strpos( $post->post_content, '<!--noteaser-->' ) && ( ! $multipage || $page == 1 ) ) {
+        if ( false !== strpos( $_post->post_content, '<!--noteaser-->' ) && ( ! $elements['multipage'] || $elements['page'] == 1 ) ) {
                 $strip_teaser = true;
         }
 
         $teaser = $content[0];
 
-        if ( $more && $strip_teaser && $has_teaser ) {
+        if ( $elements['more'] && $strip_teaser && $has_teaser ) {
                 $teaser = '';
         }
 
         $output .= $teaser;
 
         if ( count( $content ) > 1 ) {
-                if ( $more ) {
-                        $output .= '<span id="more-' . $post->ID . '"></span>' . $content[1];
+                if ( $elements['more'] ) {
+                        $output .= '<span id="more-' . $_post->ID . '"></span>' . $content[1];
                 } else {
                         if ( ! empty( $more_link_text ) ) {
 
@@ -332 +345 @@
                                  * @param string $more_link_element Read More link element.
                                  * @param string $more_link_text    Read More text.
                                  */
-                                $output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-{$post->ID}\" class=\"more-link\">$more_link_text</a>", $more_link_text );
+                                $output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink( $_post ) . "#more-{$_post->ID}\" class=\"more-link\">$more_link_text</a>", $more_link_text );
                         }
                         $output = force_balance_tags( $output );
                 }

src/wp-includes/query.php

@@ -1111 +1111 @@
 
         return false;
 }
+
+/**
+ * Generate post data.
+ *
+ * @since 5.2.0
+ *
+ * @global WP_Query $wp_query Global WP_Query instance.
+ *
+ * @param WP_Post|object|int $post WP_Post instance or Post ID/object.
+ * @return array|bool Elements of post, or false on failure.
+ */
+function generate_postdata( $post ) {
+        global $wp_query;
+
+        if ( ! empty( $wp_query ) && $wp_query instanceof WP_Query ) {
+                return $wp_query->generate_postdata( $post );
+        }
+
+        return false;
+}

tests/phpunit/tests/post/getTheExcerpt.php

@@ -57 +57 @@
                 $post_id         = self::factory()->post->create( array( 'post_excerpt' => 'Bar' ) );
                 $this->assertSame( 'Bar', get_the_excerpt( $post_id ) );
         }
+
+        /**
+         * @ticket 42814
+         */
+        public function test_should_fall_back_on_post_content_if_excerpt_is_empty_and_post_is_inferred_from_context() {
+                $post_id = self::factory()->post->create( array( 'post_content' => 'Foo', 'post_excerpt' => '' ) );
+
+                $q = new WP_Query( array(
+                        'p' => $post_id,
+                ) );
+
+                while ( $q->have_posts() ) {
+                        $q->the_post();
+                        $found = get_the_excerpt();
+                }
+
+                $this->assertSame( 'Foo', $found );
+        }
+
+        /**
+         * @ticket 42814
+         */
+        public function test_should_fall_back_on_post_content_if_excerpt_is_empty_and_post_is_provided() {
+                $GLOBALS['post'] = self::factory()->post->create_and_get( array(
+                        'post_content' => 'Foo',
+                        'post_excerpt' => ''
+                ) );
+                $this->assertSame( 'Foo', get_the_excerpt( $GLOBALS['post'] ) );
+        }
+
+        /**
+         * @ticket 42814
+         */
+        public function test_should_respect_post_parameter_in_the_loop() {
+                $p1 = self::factory()->post->create_and_get( array( 'post_excerpt' => 'Foo' ) );
+                $p2 = self::factory()->post->create_and_get( array( 'post_excerpt' => 'Bar' ) );
+                $q  = new WP_Query( array(
+                        'p' => $p1->ID,
+                ) );
+
+                while ( $q->have_posts() ) {
+                        $q->the_post();
+                        $found = get_the_excerpt( $p2 );
+                }
+
+                $this->assertSame( 'Bar', $found );
+        }
+
+        /**
+         * @ticket 42814
+         */
+        public function test_should_respect_post_parameter_in_the_loop_when_falling_back_on_post_content() {
+                $p1 = self::factory()->post->create_and_get( array( 'post_content' => 'Foo', 'post_excerpt' => '' ) );
+                $p2 = self::factory()->post->create_and_get( array( 'post_content' => 'Bar', 'post_excerpt' => '' ) );
+                $q  = new WP_Query( array(
+                        'p' => $p1->ID,
+                ) );
+
+                while ( $q->have_posts() ) {
+                        $q->the_post();
+                        $found = get_the_excerpt( $p2 );
+                }
+
+                $this->assertSame( 'Bar', $found );
+        }
 }