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

Timestamp:

02/11/2012 04:42:04 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Friends component. See #3989.

File:

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

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

@@ -1 +1 @@
 <?php
+
+/**
+ * BuddyPress Friends Template Functions
+ *
+ * @package BuddyPress
+ * @subpackage FriendsTemplate
+ */
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
@@ -58 +66 @@
  */
 function bp_friends_header_tabs() {
-        global $bp; ?>
+?>
 
         <li<?php if ( !bp_action_variable( 0 ) || bp_is_action_variable( 'recently-active', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_displayed_user_domain() . bp_get_friends_slug() . '/my-friends/recently-active' ) ?>"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
@@ -91 +99 @@
 
 function bp_friends_random_friends() {
-        global $bp;
 
         if ( !$friend_ids = wp_cache_get( 'friends_friend_ids_' . bp_displayed_user_id(), 'bp' ) ) {
@@ -123 +130 @@
 
                 <?php } ?>
+
                 <div class="clear"></div>
         </div>
+
 <?php
 }
@@ -138 +147 @@
  */
 function bp_friends_random_members( $total_members = 5 ) {
-        global $bp;
 
         if ( !$user_ids = wp_cache_get( 'friends_random_users', 'bp' ) ) {
@@ -196 +204 @@
 
 function bp_friend_search_form() {
-        global $friends_template, $bp;
 
         $action = bp_displayed_user_domain() . bp_get_friends_slug() . '/my-friends/search/';
-        $label = __( 'Filter Friends', 'buddypress' ); ?>
+        $label  = __( 'Filter Friends', 'buddypress' ); ?>
 
                 <form action="<?php echo $action ?>" id="friend-search-form" method="post">
@@ -228 +235 @@
 
 function bp_member_total_friend_count() {
-        global $members_template;
-
         echo bp_get_member_total_friend_count();
 }
@@ -257 +262 @@
          * Returns the ID of the potential friend
          *
-         * @global object $bp
          * @global object $friends_template
          * @param int $user_id
@@ -263 +267 @@
          */
         function bp_get_potential_friend_id( $user_id = 0 ) {
-                global $bp, $friends_template;
+                global $friends_template;
 
                 if ( empty( $user_id ) && isset( $friends_template->friendship->friend ) )
@@ -278 +282 @@
  * Returns - 'is_friend', 'not_friends', 'pending'
  *
- * @global object $bp
  * @param int $potential_friend_id
  * @return string
  */
 function bp_is_friend( $user_id = 0 ) {
-        global $bp;
 
         if ( !is_user_logged_in() )
@@ -301 +303 @@
 }
         function bp_get_add_friend_button( $potential_friend_id = 0, $friend_status = false ) {
-                global $bp, $friends_template;
 
                 if ( empty( $potential_friend_id ) )
@@ -367 +368 @@
 
 function bp_get_friend_ids( $user_id = 0 ) {
-        global $bp;
-
-        if ( !$user_id )
+
+        if ( empty( $user_id ) )
                 $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
 
@@ -380 +380 @@
 }
 function bp_get_friendship_requests() {
-        global $bp;
-
         return apply_filters( 'bp_get_friendship_requests', implode( ',', (array) friends_get_friendship_request_user_ids( bp_loggedin_user_id() ) ) );
 }
@@ -389 +387 @@
 }
         function bp_get_friend_friendship_id() {
-                global $members_template, $bp;
+                global $members_template;
 
                 if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id() ) ) {
@@ -403 +401 @@
 }
         function bp_get_friend_accept_request_link() {
-                global $members_template, $bp;
+                global $members_template;
 
                 if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id() ) ) {
@@ -417 +415 @@
 }
         function bp_get_friend_reject_request_link() {
-                global $members_template, $bp;
+                global $members_template;
 
                 if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id() ) ) {
@@ -439 +437 @@
 }
         function bp_friend_get_total_requests_count( $user_id = 0 ) {
-                global $bp;
-
                 if ( empty( $user_id ) )
                         $user_id = bp_loggedin_user_id();