Changes in trunk/src/wp-includes/blocks/post-excerpt.php [56065:55246]

File:

• trunk/src/wp-includes/blocks/post-excerpt.php (modified) (2 diffs)

trunk/src/wp-includes/blocks/post-excerpt.php

@@ -19 +19 @@
     }
 
-    /*
-    * The purpose of the excerpt length setting is to limit the length of both
-    * automatically generated and user-created excerpts.
-    * Because the excerpt_length filter only applies to auto generated excerpts,
-    * wp_trim_words is used instead.
-    */
-    $excerpt_length = $attributes['excerptLength'];
-    $excerpt        = get_the_excerpt( $block->context['postId'] );
-    if ( isset( $excerpt_length ) ) {
-        $excerpt = wp_trim_words( $excerpt, $excerpt_length );
+    $excerpt = get_the_excerpt();
+
+    if ( empty( $excerpt ) ) {
+        return '';
     }
 
     $more_text           = ! empty( $attributes['moreText'] ) ? '<a class="wp-block-post-excerpt__more-link" href="' . esc_url( get_the_permalink( $block->context['postId'] ) ) . '">' . wp_kses_post( $attributes['moreText'] ) . '</a>' : '';
-    $filter_excerpt_more = static function( $more ) use ( $more_text ) {
+    $filter_excerpt_more = function( $more ) use ( $more_text ) {
         return empty( $more_text ) ? $more : '';
     };
@@ -77 +71 @@
 }
 add_action( 'init', 'register_block_core_post_excerpt' );
-
-/**
- * If themes or plugins filter the excerpt_length, we need to
- * override the filter in the editor, otherwise
- * the excerpt length block setting has no effect.
- * Returns 100 because 100 is the max length in the setting.
- */
-if ( is_admin() ||
-    defined( 'REST_REQUEST' ) && REST_REQUEST ) {
-    add_filter(
-        'excerpt_length',
-        static function() {
-            return 100;
-        },
-        PHP_INT_MAX
-    );
-}