Changeset 24214 for trunk/wp-includes/formatting.php

Timestamp:

05/09/2013 12:22:02 AM (12 years ago)

Author:

SergeyBiryukov

Message:

• Pass ellipsis as a parameter to wp_html_excerpt() instead of appending it manually.
• Consolidate the logic to avoid appending ellipsis if the entire string is shown.
• Show ellipsis after truncated filenames and post titles.

props solarissmoke, bpetty, SergeyBiryukov. fixes #11446.

File:

• trunk/wp-includes/formatting.php (modified) (2 diffs)

trunk/wp-includes/formatting.php

@@ -2200 +2200 @@
  * @param string $text Text to trim.
  * @param int $num_words Number of words. Default 55.
- * @param string $more What to append if $text needs to be trimmed. Default '…'.
+ * @param string $more Optional. What to append if $text needs to be trimmed. Default '…'.
  * @return string Trimmed text.
  */
@@ -3119 +3119 @@
  * @param integer $str String to get the excerpt from.
  * @param integer $count Maximum number of characters to take.
+ * @param string $more Optional. What to append if $str needs to be trimmed. Defaults to empty string.
  * @return string The excerpt.
  */
-function wp_html_excerpt( $str, $count ) {
+function wp_html_excerpt( $str, $count, $more = null ) {
+    if ( null === $more )
+        $more = '';
     $str = wp_strip_all_tags( $str, true );
-    $str = mb_substr( $str, 0, $count );
+    $excerpt = mb_substr( $str, 0, $count );
     // remove part of an entity at the end
-    $str = preg_replace( '/&[^;\s]{0,6}$/', '', $str );
-    return $str;
+    $excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt );
+    if ( $str != $excerpt )
+        $excerpt = trim( $excerpt ) . $more;
+    return $excerpt;
 }