Changeset 51445 for branches/5.8/src/wp-includes/blocks/post-excerpt.php

Timestamp:

07/15/2021 09:12:39 PM (4 years ago)

Author:

desrosj

Message:

Block Editor: Backport fixes targeted for WordPress 5.8 RC4.

This includes:

• Suggestion List: Check if a node exists to scroll into view.
• Autocomplete: reset state for empty text.
• Adds auxiliary class names for editor styles in the widgets editor.
• Extract snackbars into a separate component.
• Rich text: run input rules after composition end.
• iframe: load inline styles.
• Multi select: select all: restore ref callback.
• Writing flow: allow select all from empty selection.
• Post Excerpt: Fix excerpt_more filter conflict and remove wordCount attribute.
• Add the percent unit to the default units in Core.

Props desrosj, youknowriad.
Merges [51443] to the 5.8 branch.
Fixes #53397.

Location:

branches/5.8

Files:

• . (modified) (1 prop)
• src/wp-includes/blocks/post-excerpt.php (modified) (1 diff)

branches/5.8/src/wp-includes/blocks/post-excerpt.php

@@ -19 +19 @@
     }
 
-    $more_text = isset( $attributes['moreText'] ) ? '<a class="wp-block-post-excerpt__more-link" href="' . esc_url( get_the_permalink( $block->context['postId'] ) ) . '">' . $attributes['moreText'] . '</a>' : '';
-
-    $filter_excerpt_length = function() use ( $attributes ) {
-        return isset( $attributes['wordCount'] ) ? $attributes['wordCount'] : 55;
+    $more_text           = ! empty( $attributes['moreText'] ) ? '<a class="wp-block-post-excerpt__more-link" href="' . esc_url( get_the_permalink( $block->context['postId'] ) ) . '">' . $attributes['moreText'] . '</a>' : '';
+    $filter_excerpt_more = function( $more ) use ( $more_text ) {
+        return empty( $more_text ) ? $more : '';
     };
-    add_filter(
-        'excerpt_length',
-        $filter_excerpt_length
-    );
-
+    /**
+     * Some themes might use `excerpt_more` filter to handle the
+     * `more` link displayed after a trimmed excerpt. Since the
+     * block has a `more text` attribute we have to check and
+     * override if needed the return value from this filter.
+     * So if the block's attribute is not empty override the
+     * `excerpt_more` filter and return nothing. This will
+     * result in showing only one `read more` link at a time.
+     */
+    add_filter( 'excerpt_more', $filter_excerpt_more );
     $classes = '';
     if ( isset( $attributes['textAlign'] ) ) {
-        $classes .= 'has-text-align-' . $attributes['textAlign'];
+        $classes .= "has-text-align-{$attributes['textAlign']}";
     }
     $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
 
-    $content = '<p class="wp-block-post-excerpt__excerpt">' . get_the_excerpt( $block->context['postId'] );
-    if ( ! isset( $attributes['showMoreOnNewLine'] ) || $attributes['showMoreOnNewLine'] ) {
+    $content               = '<p class="wp-block-post-excerpt__excerpt">' . get_the_excerpt( $block->context['postId'] );
+    $show_more_on_new_line = ! isset( $attributes['showMoreOnNewLine'] ) || $attributes['showMoreOnNewLine'];
+    if ( $show_more_on_new_line && ! empty( $more_text ) ) {
         $content .= '</p><p class="wp-block-post-excerpt__more-text">' . $more_text . '</p>';
     } else {
         $content .= " $more_text</p>";
     }
-
-    remove_filter(
-        'excerpt_length',
-        $filter_excerpt_length
-    );
-
+    remove_filter( 'excerpt_more', $filter_excerpt_more );
     return sprintf( '<div %1$s>%2$s</div>', $wrapper_attributes, $content );
 }