Ticket #16372: 16372.patch

wp-includes/formatting.php

@@ -1838 +1838 @@
 }
 
 /**
+ * Creates a short version of the text, according to the word limit.
+ *
+ * @since 3.2.0
+ *
+ * @param string $text The text to trim.
+ * @param int $length Optional. Word limit.
+ * @param string $more Optional. The string to replace the text which was left out.
+ * @return string Trimmed text.
+*/
+function wp_trim_words( $text, $length = 55, $more = '[...]' ) {
+        $words = preg_split( "/[\n\r\t ]+/", $text, $length + 1, PREG_SPLIT_NO_EMPTY );
+        if ( count($words) > $length ) {
+                array_pop($words);
+                $text = implode(' ', $words);
+                $text = $text . $more;
+        } else {
+                $text = implode(' ', $words);
+        }
+        return $text;
+}
+
+/**
  * Generates an excerpt from the content, if needed.
  *
  * The excerpt word amount will be 55 words and if the amount is greater than
@@ -1864 +1886 @@
                 $text = strip_tags($text);
                 $excerpt_length = apply_filters('excerpt_length', 55);
                 $excerpt_more = apply_filters('excerpt_more', ' ' . '[...]');
-                $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);
-                }
+                $text = wp_trim_words($text, $excerpt_length, $excerpt_more);
         }
         return apply_filters('wp_trim_excerpt', $text, $raw_excerpt);
 }