Changeset 4809

Timestamp:

07/22/2011 08:30:54 PM (14 years ago)

Author:

djpaul

Message:

Remove remaining · from templates.
Normalise output of bp_get_member_latest_update() and bp_get_activity_latest_update().
Swapped remaing $bp->activity->root_slug for bp_get_activity_root_slug(). See #3325

Location:

trunk

Files:

• bp-activity/bp-activity-template.php (modified) (4 diffs)
• bp-members/bp-members-template.php (modified) (1 diff)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)

trunk/bp-activity/bp-activity-template.php

@@ -1151 +1151 @@
         global $bp;
 
-        return apply_filters( 'bp_get_activity_comment_form_action', home_url( $bp->activity->root_slug . '/reply/' ) );
+        return apply_filters( 'bp_get_activity_comment_form_action', home_url( bp_get_activity_root_slug() . '/reply/' ) );
     }
 
@@ -1179 +1179 @@
     function bp_get_activity_favorite_link() {
         global $bp, $activities_template;
-        return apply_filters( 'bp_get_activity_favorite_link', wp_nonce_url( home_url( $bp->activity->root_slug . '/favorite/' . $activities_template->activity->id . '/' ), 'mark_favorite' ) );
+        return apply_filters( 'bp_get_activity_favorite_link', wp_nonce_url( home_url( bp_get_activity_root_slug() . '/favorite/' . $activities_template->activity->id . '/' ), 'mark_favorite' ) );
     }
 
@@ -1187 +1187 @@
     function bp_get_activity_unfavorite_link() {
         global $bp, $activities_template;
-        return apply_filters( 'bp_get_activity_unfavorite_link', wp_nonce_url( home_url( $bp->activity->root_slug . '/unfavorite/' . $activities_template->activity->id . '/' ), 'unmark_favorite' ) );
+        return apply_filters( 'bp_get_activity_unfavorite_link', wp_nonce_url( home_url( bp_get_activity_root_slug() . '/unfavorite/' . $activities_template->activity->id . '/' ), 'unmark_favorite' ) );
     }
 
@@ -1268 +1268 @@
             return false;
 
-        $latest_update = '"' . apply_filters( 'bp_get_activity_latest_update_excerpt', trim( strip_tags( bp_create_excerpt( $update['content'], 358 ) ) ) ) . '"';
-        $latest_update .= ' &middot; <a href="' . bp_get_root_domain() . '/' . $bp->activity->root_slug . '/p/' . $update['id'] . '/"> ' . __( 'View', 'buddypress' ) . '</a>';
+        $latest_update = apply_filters( 'bp_get_activity_latest_update_excerpt', '&quot;' . trim( strip_tags( bp_create_excerpt( $update['content'], 358 ) ) ) . '&quot;' );
+        $latest_update .= ' <a href="' . bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $update['id'] . '/"> ' . __( 'View', 'buddypress' ) . '</a>';
 
         return apply_filters( 'bp_get_activity_latest_update', $latest_update  );

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

@@ -545 +545 @@
             return false;
 
-        $update_content = apply_filters( 'bp_get_activity_latest_update', strip_tags( bp_create_excerpt( $update['content'], $length ) ) );
+        $update_content = apply_filters( 'bp_get_activity_latest_update', '"' . trim( strip_tags( bp_create_excerpt( $update['content'], $length ) ) ) . '"' );
 
         if ( !empty( $update['id'] ) && bp_is_active( 'activity' ) )
-            $update_content .= ' &middot; <a href="' . bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $update['id'] . '">' . __( 'View', 'buddypress' ) . '</a>';
+            $update_content .= ' <a href="' . bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $update['id'] . '">' . __( 'View', 'buddypress' ) . '</a>';
 
         return apply_filters( 'bp_get_member_latest_update', $update_content );

trunk/bp-themes/bp-default/_inc/global.js

@@ -96 +96 @@
                     var u = '';
                     if ( ltext != '' )
-                        u = l + '· ';
+                        u = '"' + l + '" ';
 
                     u += '<a href="' + v + '" rel="nofollow">' + BP_DTheme.view + '</a>';