Changeset 56560 for trunk/src/wp-includes/formatting.php

Timestamp:

09/12/2023 07:18:34 PM (3 years ago)

Author:

flixos90

Message:

Posts, Post Types: Avoid unnecessarily parsing blocks twice in wp_trim_excerpt().

All blocks relevant for the excerpt are already being parsed in excerpt_remove_blocks(). Therefore running do_blocks() on the post content only to create the excerpt is unnecessary and wasteful from a performance perspective.

Props thekt12, spacedmonkey, mukesh27, joemcgill.
Fixes #58682.

File:

• trunk/src/wp-includes/formatting.php (modified) (2 diffs)

trunk/src/wp-includes/formatting.php

@@ -3981 +3981 @@
          * is wasteful and can lead to bugs in the image counting logic.
          */
-        $filter_removed = remove_filter( 'the_content', 'wp_filter_content_tags' );
+        $filter_image_removed = remove_filter( 'the_content', 'wp_filter_content_tags' );
+
+        /*
+         * Temporarily unhook do_blocks() since excerpt_remove_blocks( $text )
+         * handels block rendering needed for excerpt.
+         */
+        $filter_block_removed = remove_filter( 'the_content', 'do_blocks', 9 );
 
         /** This filter is documented in wp-includes/post-template.php */
@@ -3987 +3993 @@
         $text = str_replace( ']]>', ']]>', $text );
 
-        /**
+        // Restore the original filter if removed.
+        if ( $filter_block_removed ) {
+            add_filter( 'the_content', 'do_blocks', 9 );
+        }
+
+        /*
          * Only restore the filter callback if it was removed above. The logic
          * to unhook and restore only applies on the default priority of 10,
          * which is generally used for the filter callback in WordPress core.
          */
-        if ( $filter_removed ) {
+        if ( $filter_image_removed ) {
             add_filter( 'the_content', 'wp_filter_content_tags' );
         }