Ticket #36934: 36934a.diff

src/wp-includes/default-filters.php

@@ -139 +139 @@
 add_filter( 'the_content', 'prepend_attachment'                );
 add_filter( 'the_content', 'wp_make_content_images_responsive' );
 
-add_filter( 'the_excerpt',     'wptexturize'      );
-add_filter( 'the_excerpt',     'convert_smilies'  );
-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( 'the_excerpt',     'wptexturize'            );
+add_filter( 'the_excerpt',     'convert_smilies'        );
+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', 10, 2 );
 
 add_filter( 'the_post_thumbnail_caption', 'wptexturize'     );
 add_filter( 'the_post_thumbnail_caption', 'convert_smilies' );

src/wp-includes/formatting.php

@@ -3259 +3259 @@
  * The ' […]' string can be modified by plugins/themes using the {@see 'excerpt_more'} filter
  *
  * @since 1.5.0
+ * @since 4.6.0 Introduced the `$post` parameter.
  *
  * @param string $text Optional. The excerpt. If set to empty, an excerpt is generated.
+ * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @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('');
+                $text = get_the_content( $post, '' );
 
                 $text = strip_shortcodes( $text );
 

src/wp-includes/post-template.php

@@ -257 +257 @@
  * @param bool   $strip_teaser   Optional. Strip teaser content before the more text. Default is false.
  * @return string
  */
-function get_the_content( $more_link_text = null, $strip_teaser = false ) {
+function get_the_content( $post = null, $more_link_text = null, $strip_teaser = false ) {
         global $page, $more, $preview, $pages, $multipage;
 
-        $post = get_post();
+        if ( is_bool( $more_link_text ) || is_string( $post ) ) {
+                $strip_teaser   = $more_link_text;
+                $more_link_text = $post;
+                $post           = null;
+        }
+
+        $post = get_post( $post );
 
         if ( null === $more_link_text ) {
                 $more_link_text = sprintf(
@@ -281 +287 @@
         if ( post_password_required( $post ) )
                 return get_the_password_form( $post );
 
+        setup_postdata( $post );
+
         if ( $page > count( $pages ) ) // if the requested page doesn't exist
                 $page = count( $pages ); // give them the highest numbered page that DOES exist
 
@@ -327 +335 @@
         if ( $preview ) // Preview fix for JavaScript bug with foreign languages.
                 $output =       preg_replace_callback( '/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output );
 
+        wp_reset_postdata();
+
         return $output;
 }
 

tests/phpunit/tests/formatting/WpTrimExcerpt.php

@@ -26 +26 @@
                         while ( $q->have_posts() ) {
                                 $q->the_post();
                                 $this->assertSame( 'Post 2 Page 1', wp_trim_excerpt() );
+                                $this->assertSame( 'Post 1 Page 1Post 1 Page 2', wp_trim_excerpt( '', $post1 ) );
                         }
                 }
         }
@@ -51 +52 @@
                         while ( $q->have_posts() ) {
                                 $q->the_post();
                                 $this->assertSame( 'Post 2 Page 1', wp_trim_excerpt() );
+                                $this->assertSame( 'Post 1 Page 1', wp_trim_excerpt( '', $post1 ) );
                         }
                 }
         }