Changeset 5687

Timestamp:

02/09/2012 11:00:59 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Audit the usage of $bp->is_item_admin and $bp->is_item_mod to use the _is_ functions isntead. Also fix some $bp globals in the process. See #3989.

Location:

trunk

Files:

• bp-forums/bp-forums-template.php (modified) (3 diffs)
• bp-groups/bp-groups-buddybar.php (modified) (2 diffs)
• bp-groups/bp-groups-classes.php (modified) (2 diffs)
• bp-groups/bp-groups-functions.php (modified) (5 diffs)
• bp-groups/bp-groups-loader.php (modified) (1 diff)
• bp-groups/bp-groups-screens.php (modified) (14 diffs)
• bp-groups/bp-groups-template.php (modified) (60 diffs)

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

@@ -775 +775 @@
 }
     function bp_get_the_topic_is_mine() {
-        global $bp, $forum_template;
+        global $forum_template;
 
         return bp_loggedin_user_id() == $forum_template->topic->topic_poster;
@@ -784 +784 @@
 }
     function bp_get_the_topic_admin_links( $args = '' ) {
-        global $bp, $forum_template;
+        global $forum_template;
 
         $defaults = array(
@@ -795 +795 @@
         $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'edit', 'bp_forums_edit_topic' ) . '">' . __( 'Edit Topic', 'buddypress' ) . '</a>';
 
-        if ( $bp->is_item_admin || $bp->is_item_mod || bp_current_user_can( 'bp_moderate' ) ) {
+        if ( bp_is_item_admin() || bp_is_item_mod() || bp_current_user_can( 'bp_moderate' ) ) {
             if ( 0 == (int)$forum_template->topic->topic_sticky )
                 $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'stick', 'bp_forums_stick_topic' ) . '">' . __( 'Sticky Topic', 'buddypress' ) . '</a>';

trunk/bp-groups/bp-groups-buddybar.php

@@ -4 +4 @@
 
 function bp_groups_adminbar_admin_menu() {
-    global $bp, $groups_template;
+    global $bp;
 
     if ( empty( $bp->groups->current_group ) )
@@ -10 +10 @@
 
     // Don't show this menu to non site admins or if you're viewing your own profile
-    if ( !current_user_can( 'edit_users' ) || !bp_current_user_can( 'bp_moderate' ) || ( !$bp->is_item_admin && !$bp->is_item_mod ) )
+    if ( !current_user_can( 'edit_users' ) || !bp_current_user_can( 'bp_moderate' ) || ( bp_is_item_admin() && ! bp_is_item_mod() ) )
         return false; ?>
 

trunk/bp-groups/bp-groups-classes.php

@@ -1304 +1304 @@
 
         // Construct the admin edit tab for the new group extension
-        if ( !empty( $this->enable_edit_item ) && !empty( $bp->is_item_admin ) ) {
+        if ( !empty( $this->enable_edit_item ) && bp_is_item_admin() ) {
             add_action( 'groups_admin_tabs', create_function( '$current, $group_slug', '$selected = ""; if ( "' . esc_attr( $this->admin_slug ) . '" == $current ) $selected = " class=\"current\""; echo "<li{$selected}><a href=\"' . trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/{$group_slug}/admin/' . esc_attr( $this->admin_slug ) ) . '\">' . esc_attr( $this->admin_name ) . '</a></li>";' ), 10, 2 );
 
@@ -1332 +1332 @@
 
 function bp_register_group_extension( $group_extension_class ) {
-    global $bp;
 
     if ( !class_exists( $group_extension_class ) )

trunk/bp-groups/bp-groups-functions.php

@@ -198 +198 @@
 
     // Check the user is the group admin.
-    if ( !$bp->is_item_admin )
+    if ( ! bp_is_item_admin() )
         return false;
 
@@ -699 +699 @@
 
 function groups_promote_member( $user_id, $group_id, $status ) {
-    global $bp;
-
-    if ( !$bp->is_item_admin )
+
+    if ( ! bp_is_item_admin() )
         return false;
 
@@ -722 +721 @@
 
 function groups_ban_member( $user_id, $group_id ) {
-    global $bp;
-
-    if ( !$bp->is_item_admin )
+
+    if ( ! bp_is_item_admin() )
         return false;
 
@@ -735 +733 @@
 
 function groups_unban_member( $user_id, $group_id ) {
-    global $bp;
-
-    if ( !$bp->is_item_admin )
+
+    if ( ! bp_is_item_admin() )
         return false;
 
@@ -750 +747 @@
 
 function groups_remove_member( $user_id, $group_id ) {
-    global $bp;
-
-    if ( !$bp->is_item_admin )
+
+    if ( ! bp_is_item_admin() )
         return false;
 

trunk/bp-groups/bp-groups-loader.php

@@ -384 +384 @@
                     'screen_function' => 'groups_screen_group_admin',
                     'position'        => 1000,
-                    'user_has_access' => ( $bp->is_item_admin + (int)$bp->is_item_mod ),
+                    'user_has_access' => true,
                     'item_css_id'     => 'admin'
                 );

trunk/bp-groups/bp-groups-screens.php

@@ -168 +168 @@
 
             // Sticky a topic
-            else if ( bp_is_action_variable( 'stick', 2 ) && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) {
+            else if ( bp_is_action_variable( 'stick', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
                 // Check the nonce
                 check_admin_referer( 'bp_forums_stick_topic' );
@@ -182 +182 @@
 
             // Un-Sticky a topic
-            else if ( bp_is_action_variable( 'unstick', 2 ) && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) {
+            else if ( bp_is_action_variable( 'unstick', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
                 // Check the nonce
                 check_admin_referer( 'bp_forums_unstick_topic' );
@@ -196 +196 @@
 
             // Close a topic
-            else if ( bp_is_action_variable( 'close', 2 ) && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) {
+            else if ( bp_is_action_variable( 'close', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
                 // Check the nonce
                 check_admin_referer( 'bp_forums_close_topic' );
@@ -210 +210 @@
 
             // Open a topic
-            else if ( bp_is_action_variable( 'open', 2 ) && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) {
+            else if ( bp_is_action_variable( 'open', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
                 // Check the nonce
                 check_admin_referer( 'bp_forums_open_topic' );
@@ -229 +229 @@
 
                 /* Check the logged in user can delete this topic */
-                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)bp_loggedin_user_id() != (int)$topic->topic_poster )
+                if ( ! bp_is_item_admin() && ! bp_is_item_mod() && ( (int) bp_loggedin_user_id() != (int) $topic->topic_poster ) )
                     bp_core_redirect( wp_get_referer() );
 
@@ -252 +252 @@
 
                 // Check the logged in user can edit this topic
-                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)bp_loggedin_user_id() != (int)$topic->topic_poster )
+                if ( ! bp_is_item_admin() && ! bp_is_item_mod() && ( (int) bp_loggedin_user_id() != (int) $topic->topic_poster ) )
                     bp_core_redirect( wp_get_referer() );
 
@@ -279 +279 @@
 
                 // Check the logged in user can edit this topic
-                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)bp_loggedin_user_id() != (int)$post->poster_id )
+                if ( ! bp_is_item_admin() && ! bp_is_item_mod() && ( (int) bp_loggedin_user_id() != (int) $post->poster_id ) )
                     bp_core_redirect( wp_get_referer() );
 
@@ -302 +302 @@
 
                 // Check the logged in user can edit this topic
-                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)bp_loggedin_user_id() != (int)$post->poster_id )
+                if ( ! bp_is_item_admin() && ! bp_is_item_mod() && ( (int) bp_loggedin_user_id() != (int) $post->poster_id ) )
                     bp_core_redirect( wp_get_referer() );
 
@@ -481 +481 @@
     if ( bp_is_groups_component() && bp_is_action_variable( 'edit-details', 0 ) ) {
 
-        if ( $bp->is_item_admin || $bp->is_item_mod  ) {
+        if ( bp_is_item_admin() || bp_is_item_mod() ) {
 
             // If the edit form has been submitted, save the edited details
@@ -513 +513 @@
     if ( bp_is_groups_component() && bp_is_action_variable( 'group-settings', 0 ) ) {
 
-        if ( !$bp->is_item_admin )
+        if ( ! bp_is_item_admin() )
             return false;
 
@@ -556 +556 @@
 
         // If the logged-in user doesn't have permission or if avatar uploads are disabled, then stop here
-        if ( !$bp->is_item_admin || (int)bp_get_option( 'bp-disable-avatar-uploads' ) )
+        if ( ! bp_is_item_admin() || (int) bp_get_option( 'bp-disable-avatar-uploads' ) )
             return false;
 
@@ -619 +619 @@
     if ( bp_is_groups_component() && bp_is_action_variable( 'manage-members', 0 ) ) {
 
-        if ( !$bp->is_item_admin )
+        if ( ! bp_is_item_admin() )
             return false;
 
@@ -734 +734 @@
     if ( bp_is_groups_component() && bp_is_action_variable( 'membership-requests', 0 ) ) {
 
-        if ( !$bp->is_item_admin || 'public' == $bp->groups->current_group->status )
+        if ( ! bp_is_item_admin() || ( 'public' == $bp->groups->current_group->status ) )
             return false;
 
@@ -783 +783 @@
     if ( bp_is_groups_component() && bp_is_action_variable( 'delete-group', 0 ) ) {
 
-        if ( !$bp->is_item_admin && !bp_current_user_can( 'bp_moderate' ) )
+        if ( ! bp_is_item_admin() && !bp_current_user_can( 'bp_moderate' ) )
             return false;
 

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

@@ -303 +303 @@
         return true;
 
-    if ( !$group )
+    if ( empty( $group ) )
         $group =& $groups_template->group;
 
@@ -323 +323 @@
         global $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -335 +335 @@
         global $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -347 +347 @@
         global $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -369 +369 @@
         global $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -420 +420 @@
         global $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -441 +441 @@
         global $groups_template, $bp;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -453 +453 @@
         global $groups_template, $bp;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -465 +465 @@
         global $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -477 +477 @@
         global $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -489 +489 @@
         global $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -501 +501 @@
         global $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -514 +514 @@
         global $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -530 +530 @@
         global $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -542 +542 @@
         global $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -549 +549 @@
 
 function bp_group_is_admin() {
-    global $bp;
-
-    return $bp->is_item_admin;
+    return bp_is_item_admin();
 }
 
 function bp_group_is_mod() {
-    global $bp;
-
-    return $bp->is_item_mod;
+    return bp_is_item_mod();
 }
 
@@ -563 +559 @@
     global $groups_template;
 
-    if ( !$group )
+    if ( empty( $group ) )
         $group =& $groups_template->group;
 
@@ -621 +617 @@
     global $groups_template;
 
-    if ( !$group )
+    if ( empty( $group ) )
         $group =& $groups_template->group;
 
@@ -651 +647 @@
     global $groups_template;
 
-    if ( !$group )
+    if ( empty( $group ) )
         $group =& $groups_template->group;
 
@@ -674 +670 @@
         global $groups_template, $bp;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -747 +743 @@
         global $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -771 +767 @@
         global $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -848 +844 @@
     global $groups_template;
 
-    if ( !$group )
+    if ( empty( $group ) )
         $group =& $groups_template->group;
 
@@ -868 +864 @@
     global $groups_template;
 
-    if ( !$group )
+    if ( empty( $group ) )
         $group =& $groups_template->group;
 
@@ -878 +874 @@
     global $groups_template;
 
-    if ( !$group )
+    if ( empty( $group ) )
         $group =& $groups_template->group;
 
@@ -1144 +1140 @@
     global $group_mods, $groups_template;
 
-    if ( !$group )
+    if ( empty( $group ) )
         $group =& $groups_template->group;
 
@@ -1195 +1191 @@
         global $members_template, $groups_template, $bp;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -1215 +1211 @@
         global $members_template, $groups_template, $bp;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -1235 +1231 @@
             $user_id = $members_template->member->user_id;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -1253 +1249 @@
         global $members_template, $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -1262 +1258 @@
     global $bp, $groups_template;
 
-    if ( !$group )
+    if ( empty( $group ) )
         $group = ( $groups_template->group ) ? $groups_template->group : $bp->groups->current_group;
 
     $current_tab = bp_action_variable( 0 );
-?>
-    <?php if ( $bp->is_item_admin || $bp->is_item_mod ) { ?>
+
+    if ( bp_is_item_admin() || bp_is_item_mod() ) : ?>
+
         <li<?php if ( 'edit-details' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/edit-details' ) ?>"><?php _e( 'Details', 'buddypress' ); ?></a></li>
-    <?php } ?>
-
-    <?php
-        if ( !$bp->is_item_admin )
-            return false;
-    ?>
+
+    <?php endif; ?>
+
+    <?php if ( ! bp_is_item_admin() )
+            return false; ?>
+
     <li<?php if ( 'group-settings' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/group-settings' ) ?>"><?php _e( 'Settings', 'buddypress' ); ?></a></li>
 
     <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
+
         <li<?php if ( 'group-avatar'   == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/group-avatar' ) ?>"><?php _e( 'Avatar', 'buddypress' ); ?></a></li>
+
     <?php endif; ?>
 
@@ -1284 +1283 @@
 
     <?php if ( $groups_template->group->status == 'private' ) : ?>
+
         <li<?php if ( 'membership-requests' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/membership-requests' ) ?>"><?php _e( 'Requests', 'buddypress' ); ?></a></li>
+
     <?php endif; ?>
 
@@ -1290 +1291 @@
 
     <li<?php if ( 'delete-group' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug . '/admin/delete-group' ) ?>"><?php _e( 'Delete', 'buddypress' ); ?></a></li>
+
 <?php
 }
@@ -1304 +1306 @@
 }
     function bp_get_group_form_action( $page, $group = false ) {
-        global $bp, $groups_template;
-
-        if ( !$group )
+        global $groups_template;
+
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -1318 +1320 @@
         global $groups_template;
 
-        if ( !$group )
-            $group =& $groups_template->group;
-
-        if ( !$page )
+        if ( empty( $group ) )
+            $group =& $groups_template->group;
+
+        if ( empty( $page ) )
             $page = bp_action_variable( 0 );
 
@@ -1330 +1332 @@
     global $groups_template;
 
-    if ( !$group )
+    if ( empty( $group ) )
         $group =& $groups_template->group;
 
@@ -1347 +1349 @@
  * @uses apply_filters Creates bp_group_is_member filter and passes $is_member
  * @usedby groups/activity.php, groups/single/forum/edit.php, groups/single/forum/topic.php to determine template part visibility
- * @global array $bp BuddyPress Master global
  * @global object $groups_template Current Group (usually in template loop)
  * @param object $group Group to check is_member
@@ -1353 +1354 @@
  */
 function bp_group_is_member( $group = false ) {
-    global $bp, $groups_template;
+    global $groups_template;
 
     // Site admins always have access
@@ -1359 +1360 @@
         return true;
 
-    if ( !$group )
+    if ( empty( $group ) )
         $group =& $groups_template->group;
 
@@ -1385 +1386 @@
         return false;
 
-    if ( !$group ) {
+    if ( empty( $group ) ) {
         $group =& $groups_template->group;
 
@@ -1404 +1405 @@
         global $groups_template, $bp;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -1416 +1417 @@
         global $groups_template, $bp;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -1426 +1427 @@
 }
     function bp_get_group_leave_confirm_link( $group = false ) {
-        global $groups_template, $bp;
-
-        if ( !$group )
+        global $groups_template;
+
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -1438 +1439 @@
 }
     function bp_get_group_leave_reject_link( $group = false ) {
-        global $groups_template, $bp;
-
-        if ( !$group )
+        global $groups_template;
+
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -1450 +1451 @@
 }
     function bp_get_group_send_invite_form_action( $group = false ) {
-        global $groups_template, $bp;
-
-        if ( !$group )
+        global $groups_template;
+
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -1459 +1460 @@
 
 function bp_has_friends_to_invite( $group = false ) {
-    global $groups_template, $bp;
+    global $groups_template;
 
     if ( !bp_is_active( 'friends' ) )
         return false;
 
-    if ( !$group )
+    if ( empty( $group ) )
         $group =& $groups_template->group;
 
@@ -1474 +1475 @@
 
 function bp_group_new_topic_button( $group = false ) {
-    echo bp_get_group_new_topic_button();
+    echo bp_get_group_new_topic_button( $group );
 }
     function bp_get_group_new_topic_button( $group = false ) {
         global $groups_template;
 
-        if ( !$group )
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -1506 +1507 @@
 }
     function bp_get_group_join_button( $group = false ) {
-        global $bp, $groups_template;
-
-        if ( !$group )
+        global $groups_template;
+
+        if ( empty( $group ) )
             $group =& $groups_template->group;
 
@@ -1687 +1688 @@
 
     function __construct( $group_id, $per_page, $max, $exclude_admins_mods, $exclude_banned, $exclude ) {
-        global $bp;
 
         $this->pag_page = isset( $_REQUEST['mlpage'] ) ? intval( $_REQUEST['mlpage'] ) : 1;
-        $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
-
-        $this->members = BP_Groups_Member::get_all_for_group( $group_id, $this->pag_num, $this->pag_page, $exclude_admins_mods, $exclude_banned, $exclude );
+        $this->pag_num  = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
+        $this->members  = BP_Groups_Member::get_all_for_group( $group_id, $this->pag_num, $this->pag_page, $exclude_admins_mods, $exclude_banned, $exclude );
 
         if ( !$max || $max >= (int)$this->members['count'] )
@@ -1756 +1755 @@
 
     function the_member() {
-        global $member;
 
         $this->in_the_loop = true;
-        $this->member = $this->next_member();
+        $this->member      = $this->next_member();
 
         if ( 0 == $this->current_member ) // loop has just started
@@ -1767 +1765 @@
 
 function bp_group_has_members( $args = '' ) {
-    global $bp, $members_template;
+    global $members_template;
 
     $defaults = array(
@@ -1878 +1876 @@
 }
     function bp_get_group_member_is_banned() {
-        global $members_template, $groups_template;
+        global $members_template;
 
         return apply_filters( 'bp_get_group_member_is_banned', $members_template->member->is_banned );
@@ -1921 +1919 @@
 }
     function bp_get_group_pag_id() {
-        global $bp;
-
         return apply_filters( 'bp_get_group_pag_id', 'pag' );
     }
@@ -2262 +2258 @@
 
 function bp_directory_groups_search_form() {
-    global $bp;
 
     $default_search_value = bp_get_search_default_text( 'groups' );
@@ -2282 +2277 @@
  */
 function bp_groups_header_tabs() {
-    global $create_group_step, $completed_to_step;
-?>
+    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_groups_slug() . '/my-groups/recently-active' ) ?>"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
     <li<?php if ( bp_is_action_variable( 'recently-joined', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/recently-joined' ) ?>"><?php _e( 'Recently Joined', 'buddypress' ) ?></a></li>
@@ -2290 +2285 @@
     <li<?php if ( bp_is_action_variable( 'mod-of', 0 ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/mod-of' ) ?>"><?php _e( 'Moderator Of', 'buddypress' ) ?></a></li>
     <li<?php if ( bp_is_action_variable( 'alphabetically' ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( $bp->displayed_user->domain . bp_get_groups_slug() . '/my-groups/alphabetically' ) ?>"><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
+
 <?php
     do_action( 'groups_header_tabs' );
@@ -2417 +2413 @@
     function __construct( $group_id, $per_page, $max ) {
 
-        global $bp;
-
         $this->pag_page = isset( $_REQUEST['mrpage'] ) ? intval( $_REQUEST['mrpage'] ) : 1;
-        $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
-
+        $this->pag_num  = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
         $this->requests = BP_Groups_Group::get_membership_requests( $group_id, $this->pag_num, $this->pag_page );
 
@@ -2486 +2479 @@
 
     function the_request() {
-        global $request;
-
         $this->in_the_loop = true;
-        $this->request = $this->next_request();
+        $this->request     = $this->next_request();
 
         if ( 0 == $this->current_request ) // loop has just started
@@ -2591 +2582 @@
 
     function __construct( $user_id, $group_id ) {
-
-        global $bp;
-
-        $this->invites = groups_get_invites_for_group( $user_id, $group_id );
+        $this->invites      = groups_get_invites_for_group( $user_id, $group_id );
         $this->invite_count = count( $this->invites );
-
     }
 
@@ -2633 +2620 @@
 
     function the_invite() {
-        global $invite, $group_id;
-
-        $this->in_the_loop = true;
-        $user_id = $this->next_invite();
-
-        $this->invite = new stdClass;
-        $this->invite->user = new BP_Core_User( $user_id );
+        global $group_id;
+
+        $this->in_the_loop      = true;
+        $user_id                = $this->next_invite();
+        $this->invite           = new stdClass;
+        $this->invite->user     = new BP_Core_User( $user_id );
         $this->invite->group_id = $group_id; // Globaled in bp_group_has_invites()