Ticket #36934: 36934.3.patch

src/wp-includes/default-filters.php

@@ -141 +141 @@
 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( 'comment_text', 'wptexturize'            );
 add_filter( 'comment_text', 'convert_chars'          );

src/wp-includes/formatting.php

@@ -2881 +2881 @@
  * 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.
  * @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( '', false, $post );
 
                 $text = strip_shortcodes( $text );
 

src/wp-includes/post-template.php

@@ -246 +246 @@
  * Retrieve the post content.
  *
  * @since 0.71
+ * @since 4.6.0 Introduced the `$post` parameter.
  *
  * @global int   $page
  * @global int   $more
@@ -255 +256 @@
  *
  * @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 int|WP_Post|null  $post           Optional. Post ID or post object. Defaults to global $post.
  * @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 = false ) {
         global $page, $more, $preview, $pages, $multipage;
 
-        $post = get_post();
+        $post = get_post( $post );
 
         if ( null === $more_link_text )
                 $more_link_text = __( '(more…)' );