Changeset 11703

Timestamp:

09/27/2017 09:08:35 AM (9 years ago)

Author:

djpaul

Message:

Core: when checking for bp_moderate capability, use bp_current_user_can().

Fixes #7598

Props meitar for initial patch.

Location:

trunk/src

Files:

• bp-activity/bp-activity-admin.php (modified) (1 diff)
• bp-groups/bp-groups-admin.php (modified) (3 diffs)
• bp-groups/bp-groups-filters.php (modified) (1 diff)
• bp-groups/bp-groups-template.php (modified) (1 diff)
• bp-groups/classes/class-bp-group-extension.php (modified) (2 diffs)
• bp-groups/classes/class-bp-groups-group.php (modified) (1 diff)
• bp-members/classes/class-bp-members-admin.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-admin.php

@@ -95 +95 @@
         // @todo: Check if user is allowed to create new activity items
         // if ( ! current_user_can( 'bp_new_activity' ) )
-        if ( ! current_user_can( 'bp_moderate' ) )
+        if ( ! bp_current_user_can( 'bp_moderate' ) )
                 die( '-1' );
 

trunk/src/bp-groups/bp-groups-admin.php

@@ -509 +509 @@
 function bp_groups_admin_edit() {
 
-        if ( ! current_user_can( 'bp_moderate' ) )
+        if ( ! bp_current_user_can( 'bp_moderate' ) )
                 die( '-1' );
 
@@ -1097 +1097 @@
 
         // Permission check.
-        if ( ! current_user_can( 'bp_moderate' ) ) {
+        if ( ! bp_current_user_can( 'bp_moderate' ) ) {
                 return;
         }
@@ -1212 +1212 @@
 
         // Bail if user user shouldn't be here, or is a large network.
-        if ( ! current_user_can( 'bp_moderate' ) || ( is_multisite() && wp_is_large_network( 'users' ) ) ) {
+        if ( ! bp_current_user_can( 'bp_moderate' ) || ( is_multisite() && wp_is_large_network( 'users' ) ) ) {
                 wp_die( -1 );
         }

trunk/src/bp-groups/bp-groups-filters.php

@@ -310 +310 @@
 function bp_groups_disable_at_mention_notification_for_non_public_groups( $send, $usernames, $user_id, BP_Activity_Activity $activity ) {
         // Skip the check for administrators, who can get notifications from non-public groups.
-        if ( user_can( $user_id, 'bp_moderate' ) ) {
+        if ( bp_user_can( $user_id, 'bp_moderate' ) ) {
                 return $send;
         }

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

@@ -2359 +2359 @@
         if ( $user_id ) {
                 // Users with the 'bp_moderate' cap can always send invitations.
-                if ( user_can( $user_id, 'bp_moderate' ) ) {
+                if ( bp_user_can( $user_id, 'bp_moderate' ) ) {
                         $can_send_invites = true;
                 } else {

trunk/src/bp-groups/classes/class-bp-group-extension.php

@@ -809 +809 @@
 
                 // Always allow moderators to see nav items, even if explicitly 'noone'
-                if ( ( 'noone' !== $this->params['show_tab'] ) && current_user_can( 'bp_moderate' ) ) {
+                if ( ( 'noone' !== $this->params['show_tab'] ) && bp_current_user_can( 'bp_moderate' ) ) {
                         return true;
                 }
@@ -830 +830 @@
 
                 // Always allow moderators to visit a tab, even if explicitly 'noone'
-                if ( ( 'noone' !== $this->params['access'] ) && current_user_can( 'bp_moderate' ) ) {
+                if ( ( 'noone' !== $this->params['access'] ) && bp_current_user_can( 'bp_moderate' ) ) {
                         return true;
                 }

trunk/src/bp-groups/classes/class-bp-groups-group.php

@@ -1766 +1766 @@
          *
          * Will include hidden groups in the count only if
-         * current_user_can( 'bp_moderate' ).
+         * bp_current_user_can( 'bp_moderate' ).
          *
          * @since 1.6.0

trunk/src/bp-members/classes/class-bp-members-admin.php

@@ -1198 +1198 @@
 
                 // Permission check.
-                if ( ! current_user_can( 'bp_moderate' ) && $user_id != bp_loggedin_user_id() ) {
+                if ( ! bp_current_user_can( 'bp_moderate' ) && $user_id != bp_loggedin_user_id() ) {
                         return;
                 }