Changeset 4173

Timestamp:

08/24/2012 08:29:20 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Bozo:

• Map 'bozo' caps to disallow for moderators.
• Move inactive user check out of bbp_is_user_bozo() and into bbp_map_meta_caps().

Location:

branches/plugin/bbp-includes

Files:

• bbp-core-caps.php (modified) (1 diff)
• bbp-user-functions.php (modified) (1 diff)

branches/plugin/bbp-includes/bbp-core-caps.php

@@ -379 +379 @@
     // What capability is being checked?
     switch ( $cap ) {
+
+        /** General ***********************************************************/
+
+        case 'bozo' :
+
+            // Inactive users are not bozos
+            if ( bbp_is_user_inactive( $user_id ) ) {
+                $caps = array( 'do_not_allow' );
+
+            // Moderators are not bozos
+            } elseif ( user_can( $user_id, 'moderate' ) ) {
+                $caps = array( 'do_not_allow' );
+            }
+
+            break;
 
         /** Reading ***********************************************************/

branches/plugin/bbp-includes/bbp-user-functions.php

@@ -1385 +1385 @@
         return false;
 
-    // Inactive users are not bozos
-    if ( bbp_is_user_inactive( $user_id ) )
-        return false;
-
     // Return if a user has the bozo capability
     return (bool) apply_filters( 'bbp_is_user_bozo', user_can( $user_id, 'bozo' ), $user_id );