Ticket #36934: 36394.diff

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

formatting.php

@@ -2883 +2883 @@
  * @since 1.5.0
  *
  * @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.
  * @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('');
+                if ( is_null( $post ) ) {
+                        $text = get_the_content( '' );
+                } else {
+                        $post = get_post( $post );
+                        if ( ! empty( $post ) ) {
+                                $text = $post->post_content;
+                        }
+                }
 
                 $text = strip_shortcodes( $text );