Changeset 45796

Timestamp:

08/14/2019 05:17:51 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Posts, Post Types: In wp_trim_words() make sure the $num_words parameter is always an integer, as documented, to avoid a PHP warning.

Props donmhico, pikamander2.
Fixes #47867.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (2 diffs)
• tests/phpunit/tests/formatting/WPTrimWords.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

@@ -3729 +3729 @@
          * @param int $number The maximum number of words. Default 55.
          */
-        $excerpt_length = apply_filters( 'excerpt_length', $excerpt_length );
+        $excerpt_length = (int) apply_filters( 'excerpt_length', $excerpt_length );
 
         /**
@@ -3774 +3774 @@
     $original_text = $text;
     $text          = wp_strip_all_tags( $text );
+    $num_words     = (int) $num_words;
 
     /*

trunk/tests/phpunit/tests/formatting/WPTrimWords.php

@@ -74 +74 @@
         $this->assertEquals( $expected, $actual );
     }
+
+    /**
+     * @ticket 47867
+     */
+    function test_works_with_non_numeric_num_words() {
+        $this->assertEquals( '', wp_trim_words( $this->long_text, '', '' ) );
+        $this->assertEquals( '', wp_trim_words( $this->long_text, 'abc', '' ) );
+        $this->assertEquals( '', wp_trim_words( $this->long_text, null, '' ) );
+        $this->assertEquals( 'Lorem ipsum dolor', wp_trim_words( $this->long_text, '3', '' ) );
+    }
 }