Ticket #36934: 36934b.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 ) {
+        $orig_post = $GLOBALS['post'];
         $raw_excerpt = $text;
+
         if ( '' == $text ) {
-                $text = get_the_content('');
+                $post = get_post( $post );
+
+                setup_postdata( $post );
+                $GLOBALS['post'] = $post;
+
+                $text = get_the_content( '' );
+
+                $GLOBALS['post'] = $orig_post;
+                wp_reset_postdata();
 
                 $text = strip_shortcodes( $text );
 

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 ) );
                         }
                 }
         }