Changeset 10832

Timestamp:

05/31/2016 06:49:07 AM (9 years ago)

Author:

r-a-y

Message:

Activity: Improve bp_activity_truncate_entry().

• Added $args parameter, which uses the same arguments as `bp_create_excerpt() (see r10830)
• Better excerpt length truncation by checking string length.

File:

• trunk/src/bp-activity/bp-activity-filters.php (modified) (4 diffs)

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

@@ -388 +388 @@
  *
  * @since 1.5.0
+ * @since 2.6.0 Added $args parameter.
  *
  * @param string $text The original activity entry text.
+ * @param array  $args {
+ *     Optional parameters. See $options argument of {@link bp_create_excerpt()}
+ *     for all available parameters.
+ * }
  * @return string $excerpt The truncated text.
  */
-function bp_activity_truncate_entry( $text ) {
+function bp_activity_truncate_entry( $text, $args = array() ) {
     global $activities_template;
 
@@ -408 +413 @@
 
     // The full text of the activity update should always show on the single activity screen.
-    if ( ! $maybe_truncate_text || bp_is_single_activity() ) {
+    if ( empty( $args['force_truncate'] ) && ( ! $maybe_truncate_text || bp_is_single_activity() ) ) {
         return $text;
     }
@@ -430 +435 @@
     $excerpt_length = apply_filters( 'bp_activity_excerpt_length', 358 );
 
+    $args = wp_parse_args( $args, array( 'ending' => __( '…', 'buddypress' ) ) );
+
     // 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' => __( '…', 'buddypress' ) ) );
+    $excerpt        = bp_create_excerpt( $text, $excerpt_length, $args );
 
     /*
@@ -438 +445 @@
      * shortcodes, so we have strip them from the $text before the comparison.
      */
-    if ( $excerpt != strip_shortcodes( $text ) ) {
+    if ( strlen( $excerpt ) > strlen( strip_shortcodes( $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();