Changeset 13942

Timestamp:

04/02/2010 07:10:51 AM (14 years ago)

Author:

dd32

Message:

A better default except, Remove multiple white spaces from the except as well as splitting safely on UTF8 strings. Props Denis-de-Bernardy for the UTF8 split. Fixes #10376

File:

• trunk/wp-includes/formatting.php (modified) (1 diff)

trunk/wp-includes/formatting.php

@@ -1845 +1845 @@
         $excerpt_length = apply_filters('excerpt_length', 55);
         $excerpt_more = apply_filters('excerpt_more', ' ' . '[...]');
-        $words = explode(' ', $text, $excerpt_length + 1);
-        if (count($words) > $excerpt_length) {
+        $words = preg_split("/[\n\r\t ]+/", $text, $excerpt_length + 1, PREG_SPLIT_NO_EMPTY);
+        if ( count($words) > $excerpt_length ) {
             array_pop($words);
             $text = implode(' ', $words);
             $text = $text . $excerpt_more;
+        } else {
+            $text = implode(' ', $words);
         }
     }