Changeset 4989 for trunk/bp-activity/bp-activity-filters.php

Timestamp:

08/16/2011 11:33:09 AM (15 years ago)

Author:

boonebgorges

Message:

Modifies bp_create_excerpt() to take account of HTML tag length when truncating long texts. Thanks to CakePHP for the function. Refactors BP use of bp_create_excerpt(), where necessary, to account for new function argument structure. Reworks bp_activity_truncate_entry() so that already-truncated activity items (like blog posts) do not get a Read More link when they contain HTML. Introduces fallback functions for some multibyte string functions, to make bp_create_excerpt() work properly. Thanks to MediaWiki for these fallbacks. Fixes #3452. Props DJPaul for all the help with this patch.

File:

• trunk/bp-activity/bp-activity-filters.php (modified) (1 diff)

trunk/bp-activity/bp-activity-filters.php

@@ -189 +189 @@
         $append_text    = apply_filters( 'bp_activity_excerpt_append_text', __( '[Read more]', 'buddypress' ) );
         $excerpt_length = apply_filters( 'bp_activity_excerpt_length', 358 );
-        $excerpt        = $text;
-
-        $id = !empty( $activities_template->activity->current_comment->id ) ? 'acomment-read-more-' . $activities_template->activity->current_comment->id : 'activity-read-more-' . bp_get_activity_id();
-
-        if ( strlen( $excerpt ) > $excerpt_length )
-                $excerpt = sprintf( '%1$s<span class="activity-read-more" id="%2$s"><a href="%3$s" rel="nofollow">%4$s</a></span>', bp_create_excerpt( $excerpt, $excerpt_length, true, '&hellip;' ), $id, bp_get_activity_thread_permalink(), $append_text );
+
+        // Run the text through the excerpt function. If it's too short, the original text will be
+        // returned.
+        $excerpt        = bp_create_excerpt( $text, $excerpt_length, array( 'ending' => __( '&hellip;', 'buddypress' ) ) );
+
+        // If the text returned by bp_create_excerpt() is different from the original text (ie it's
+        // been truncated), add the "Read More" link.
+        if ( $excerpt != $text ) {
+                $id = !empty( $activities_template->activity->current_comment->id ) ? 'acomment-read-more-' . $activities_template->activity->current_comment->id : 'activity-read-more-' . bp_get_activity_id();
+
+                $excerpt = sprintf( '%1$s<span class="activity-read-more" id="%2$s"><a href="%3$s" rel="nofollow">%4$s</a></span>', $excerpt, $id, bp_get_activity_thread_permalink(), $append_text );
+        }
 
         return apply_filters( 'bp_activity_truncate_entry', $excerpt, $text, $append_text );