Ticket #3505: 3505.01.patch

bp-core/bp-core-template.php

@@ -482 +482 @@
         }
 
         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' );
 

bp-forums/bp-forums-template.php

@@ -716 +716 @@
                 return apply_filters( 'bp_get_the_topic_time_since_created', bp_core_time_since( strtotime( $forum_template->topic->topic_start_time ) ) );
         }
 
-function bp_the_topic_latest_post_excerpt( $args = '' ) {
-        echo bp_get_the_topic_latest_post_excerpt( $args );
+function bp_the_topic_latest_post_excerpt() {
+        echo bp_get_the_topic_latest_post_excerpt();
 }
-        function bp_get_the_topic_latest_post_excerpt( $args = '' ) {
+        function bp_get_the_topic_latest_post_excerpt() {
                 global $forum_template;
 
-                $defaults = array(
-                        'length' => 45
-                );
-
-                $r = wp_parse_args( $args, $defaults );
-                extract( $r, EXTR_SKIP );
-
                 $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 );
         }
 
 function bp_the_topic_time_since_last_post() {
-        global $forum_template;
-
         echo bp_get_the_topic_time_since_last_post();
 }
         function bp_get_the_topic_time_since_last_post() {

bp-groups/bp-groups-template.php

@@ -503 +503 @@
                 if ( !$group )
                         $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 ) );
         }
 
 

bp-members/bp-members-template.php

@@ -570 +570 @@
                 global $bp, $members_template;
 
                 $defaults = array(
-                        'length'    => 70,
                         'view_link' => true
                 );
 
                 $r = wp_parse_args( $args, $defaults );
-                extract( $r, EXTR_SKIP );
+                extract( $r );
 
-                if ( !isset( $members_template->member->latest_update ) || !$update = maybe_unserialize( $members_template->member->latest_update ) )
+                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 ) ) ) ) );
+                $update_content = apply_filters( 'bp_get_activity_latest_update_excerpt', sprintf( _x( '- "%s "', 'member latest update in member directory', 'buddypress' ), trim( strip_tags( bp_create_excerpt( $update['content'] ) ) ) ) );
+
+                // 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' );
 
-                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 .= '<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 );
         }

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

@@ -48 +48 @@
 
                                         <?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; ?>