Changeset 4647 for trunk/bp-friends/bp-friends-template.php

Timestamp:

07/12/2011 02:11:01 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Audit the usage of $bp->friends->slug. See #3325.

File:

• trunk/bp-friends/bp-friends-template.php (modified) (8 diffs)

trunk/bp-friends/bp-friends-template.php

@@ -52 +52 @@
     global $bp; ?>
 
-    <li<?php if ( !isset($bp->action_variables[0]) || 'recently-active' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
-    <li<?php if ( 'newest' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/newest"><?php _e( 'Newest', 'buddypress' ) ?></a></li>
-    <li<?php if ( 'alphabetically' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/alphabetically"><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
+    <li<?php if ( !isset($bp->action_variables[0]) || 'recently-active' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . bp_get_friends_slug() ?>/my-friends/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
+    <li<?php if ( 'newest' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . bp_get_friends_slug() ?>/my-friends/newest"><?php _e( 'Newest', 'buddypress' ) ?></a></li>
+    <li<?php if ( 'alphabetically' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . bp_get_friends_slug() ?>/my-friends/alphabetically"><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
 
 <?php
@@ -87 +87 @@
 
     <div class="info-group">
-        <h4><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?>  (<?php echo BP_Friends_Friendship::total_friend_count( $bp->displayed_user->id ) ?>) <span><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>"><?php _e('See All', 'buddypress') ?> &rarr;</a></span></h4>
+        <h4><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?>  (<?php echo BP_Friends_Friendship::total_friend_count( $bp->displayed_user->id ) ?>) <span><a href="<?php echo $bp->displayed_user->domain . bp_get_friends_slug() ?>"><?php _e('See All', 'buddypress') ?> &rarr;</a></span></h4>
 
         <?php if ( $friend_ids ) { ?>
@@ -186 +186 @@
     global $friends_template, $bp;
 
-    $action = $bp->displayed_user->domain . $bp->friends->slug . '/my-friends/search/';
+    $action = $bp->displayed_user->domain . bp_get_friends_slug() . '/my-friends/search/';
     $label = __( 'Filter Friends', 'buddypress' ); ?>
 
@@ -308 +308 @@
                     'wrapper_class'     => 'friendship-button pending',
                     'wrapper_id'        => 'friendship-button-' . $potential_friend_id,
-                    'link_href'         => trailingslashit( $bp->loggedin_user->domain . $bp->friends->slug . '/requests' ),
+                    'link_href'         => trailingslashit( $bp->loggedin_user->domain . bp_get_friends_slug() . '/requests' ),
                     'link_text'         => __( 'Friendship Requested', 'buddypress' ),
                     'link_title'        => __( 'Friendship Requested', 'buddypress' ),
@@ -323 +323 @@
                     'wrapper_class'     => 'friendship-button is_friend',
                     'wrapper_id'        => 'friendship-button-' . $potential_friend_id,
-                    'link_href'         => wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/remove-friend/' . $potential_friend_id . '/', 'friends_remove_friend' ),
+                    'link_href'         => wp_nonce_url( $bp->loggedin_user->domain . bp_get_friends_slug() . '/remove-friend/' . $potential_friend_id . '/', 'friends_remove_friend' ),
                     'link_text'         => __( 'Cancel Friendship', 'buddypress' ),
                     'link_title'        => __( 'Cancel Friendship', 'buddypress' ),
@@ -340 +340 @@
                     'wrapper_class'     => 'friendship-button not_friends',
                     'wrapper_id'        => 'friendship-button-' . $potential_friend_id,
-                    'link_href'         => wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/add-friend/' . $potential_friend_id . '/', 'friends_add_friend' ),
+                    'link_href'         => wp_nonce_url( $bp->loggedin_user->domain . bp_get_friends_slug() . '/add-friend/' . $potential_friend_id . '/', 'friends_add_friend' ),
                     'link_text'         => __( 'Add Friend', 'buddypress' ),
                     'link_title'        => __( 'Add Friend', 'buddypress' ),
@@ -398 +398 @@
         }
 
-        return apply_filters( 'bp_get_friend_accept_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/accept/' . $friendship_id, 'friends_accept_friendship' ) );
+        return apply_filters( 'bp_get_friend_accept_request_link', wp_nonce_url( $bp->loggedin_user->domain . bp_get_friends_slug() . '/requests/accept/' . $friendship_id, 'friends_accept_friendship' ) );
     }
 
@@ -412 +412 @@
         }
 
-        return apply_filters( 'bp_get_friend_reject_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/reject/' . $friendship_id, 'friends_reject_friendship' ) );
+        return apply_filters( 'bp_get_friend_reject_request_link', wp_nonce_url( $bp->loggedin_user->domain . bp_get_friends_slug() . '/requests/reject/' . $friendship_id, 'friends_reject_friendship' ) );
     }