Changeset 5030

Timestamp:

08/24/2011 07:18:57 PM (13 years ago)

Author:

boonebgorges

Message:

Cleans up use of bp_create_excerpt(). Fixes #3503. Props r-a-y

Location:

trunk

Files:

• bp-core/bp-core-template.php (modified) (1 diff)
• bp-forums/bp-forums-template.php (modified) (2 diffs)
• bp-groups/bp-groups-template.php (modified) (1 diff)
• bp-members/bp-members-template.php (modified) (1 diff)
• bp-themes/bp-default/members/members-loop.php (modified) (1 diff)

trunk/bp-core/bp-core-template.php

@@ -483 +483 @@
 
     return apply_filters( 'bp_create_excerpt', $truncate, $original_text, $length, $options );
-}
-add_filter( 'bp_create_excerpt', 'wp_trim_excerpt' );
+
+}
 add_filter( 'bp_create_excerpt', 'stripslashes_deep' );
 add_filter( 'bp_create_excerpt', 'force_balance_tags' );

trunk/bp-forums/bp-forums-template.php

@@ -724 +724 @@
 
         $defaults = array(
-            'length' => 45
+            'length' => 225
         );
 
@@ -732 +732 @@
         $post = bp_forums_get_post( $forum_template->topic->topic_last_post_id );
         $post = bp_create_excerpt( $post->post_text, $length );
-        return apply_filters( 'bp_get_the_topic_latest_post_excerpt', $post );
+
+        return apply_filters( 'bp_get_the_topic_latest_post_excerpt', $post, $length );
     }
 
 function bp_the_topic_time_since_last_post() {
-    global $forum_template;
-
     echo bp_get_the_topic_time_since_last_post();
 }

trunk/bp-groups/bp-groups-template.php

@@ -504 +504 @@
             $group =& $groups_template->group;
 
-        return apply_filters( 'bp_get_group_description_excerpt', bp_create_excerpt( $group->description, 20 ) );
+        return apply_filters( 'bp_get_group_description_excerpt', bp_create_excerpt( $group->description ) );
     }
 

trunk/bp-members/bp-members-template.php

@@ -571 +571 @@
 
         $defaults = array(
-            'length'    => 70,
+            'length'    => 225,
             'view_link' => true
         );
 
         $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
-
-        if ( !isset( $members_template->member->latest_update ) || !$update = maybe_unserialize( $members_template->member->latest_update ) )
+        extract( $r );
+
+        if ( empty( $members_template->member->latest_update ) || !$update = maybe_unserialize( $members_template->member->latest_update ) )
             return false;
 
-        $update_content = apply_filters( 'bp_get_activity_latest_update', sprintf( _x( '- "%s"', 'member latest update in member directory', 'buddypress' ), trim( strip_tags( bp_create_excerpt( $update['content'], $length ) ) ) ) );
-
-        if ( $view_link && !empty( $update['id'] ) && bp_is_active( 'activity' ) )
-            $update_content .= ' <a href="' . bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $update['id'] . '">' . __( 'View', 'buddypress' ) . '</a>';
+        $update_content = apply_filters( 'bp_get_activity_latest_update_excerpt', sprintf( _x( '- &quot;%s &quot;', 'member latest update in member directory', 'buddypress' ), trim( strip_tags( bp_create_excerpt( $update['content'], $length ) ) ) ) );
+
+        // If $view_link is true and the text returned by bp_create_excerpt() is different from the original text (ie it's
+        // been truncated), add the "View" link.
+        if ( $view_link && ( $update_content != $update['content'] ) ) {
+            $view = __( 'View', 'buddypress' );
+
+            $update_content .= '<span class="activity-read-more"><a href="' . bp_activity_get_permalink( $update['id'] ) . '" rel="nofollow">' . $view . '</a></span>';
+        }
 
         return apply_filters( 'bp_get_member_latest_update', $update_content );

trunk/bp-themes/bp-default/members/members-loop.php

@@ -49 +49 @@
                     <?php if ( bp_get_member_latest_update() ) : ?>
 
-                        <span class="update"> <?php bp_member_latest_update( array( 'length' => 10, 'view_link' => false ) ); ?></span>
+                        <span class="update"> <?php bp_member_latest_update(); ?></span>
 
                     <?php endif; ?>