Changeset 5330 for trunk/bp-groups/bp-groups-template.php

Timestamp:

11/14/2011 05:27:59 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Audit is_super_admin and is_site_admin usage. See #3740.

File:

• trunk/bp-groups/bp-groups-template.php (modified) (6 diffs)

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

@@ -111 +111 @@
         $this->pag_num  = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
 
-        if ( $bp->loggedin_user->is_super_admin || ( is_user_logged_in() && $user_id == bp_loggedin_user_id() ) )
+        if ( bp_current_user_can( 'bp_moderate' ) || ( is_user_logged_in() && $user_id == bp_loggedin_user_id() ) )
             $show_hidden = true;
 
@@ -300 +300 @@
     global $bp, $groups_template;
 
-    if ( $bp->loggedin_user->is_super_admin )
+    if ( bp_current_user_can( 'bp_moderate' ) )
         return true;
 
@@ -1344 +1344 @@
  * Checks if current user is member of a group.
  *
- * @uses is_super_admin Check if current user is super admin
+ * @uses bp_current_user_can() Check if current user is super admin
  * @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
@@ -1356 +1356 @@
 
     // Site admins always have access
-    if ( $bp->loggedin_user->is_super_admin )
+    if ( bp_current_user_can( 'bp_moderate' ) )
         return true;
 
@@ -1372 +1372 @@
  * However, if used in a single group's pages, we must use groups_is_user_banned().
  *
- * @global object $bp BuddyPress global settings
  * @global BP_Groups_Template $groups_template Group template loop object
  * @param object $group Group to check if user is banned from the group
@@ -1380 +1379 @@
  */
 function bp_group_is_user_banned( $group = false, $user_id = 0 ) {
-    global $bp, $groups_template;
+    global $groups_template;
 
     // Site admins always have access
-    if ( $bp->loggedin_user->is_super_admin )
+    if ( bp_current_user_can( 'bp_moderate' ) )
         return false;