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

git-svn-id: http://svn.automattic.com/wordpress/trunk@13942 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-04-02 07:10:51 +00:00
parent 7b55c4688a
commit cba11b1ecd
1 changed files with 4 additions and 2 deletions

View File

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