Changeset 48819

Timestamp:

08/18/2020 07:35:30 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Formatting: Make the check for empty text in wp_trim_excerpt() more resilient.

This addresses a regression in [47808], which caused excerpts to be generated from post content if an empty string is passed, but not for other values considered empty, e.g. null or false.

Props riaanlom, laxman-prajapati, SergeyBiryukov.
Merges [48817] to the 5.5 branch.
Fixes #51042.

Location:

branches/5.5

Files:

• . (modified) (1 prop)
• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/formatting/WpTrimExcerpt.php (modified) (1 diff)

branches/5.5/src/wp-includes/formatting.php

@@ -3809 +3809 @@
     $raw_excerpt = $text;
 
-    if ( '' === $text ) {
+    if ( '' === trim( $text ) ) {
         $post = get_post( $post );
         $text = get_the_content( '', false, $post );

branches/5.5/tests/phpunit/tests/formatting/WpTrimExcerpt.php

@@ -67 +67 @@
         }
     }
+
+    /**
+     * @ticket 51042
+     */
+    public function test_should_generate_excerpt_for_empty_values() {
+        $post = self::factory()->post->create(
+            array(
+                'post_content' => 'Post content',
+            )
+        );
+
+        $this->assertSame( 'Post content', wp_trim_excerpt( '', $post ) );
+        $this->assertSame( 'Post content', wp_trim_excerpt( null, $post ) );
+        $this->assertSame( 'Post content', wp_trim_excerpt( false, $post ) );
+    }
 }