Changeset 4185

Timestamp:

09/04/2012 08:36:05 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Rename global role masking to bbp_set_current_user_default_role().
• Update phpdoc and action usages.
• See #1942.

Location:

branches/plugin/bbp-includes

Files:

• bbp-core-actions.php (modified) (2 diffs)
• bbp-core-caps.php (modified) (3 diffs)

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

@@ -114 +114 @@
 
 // Multisite Global Forum Access
-add_action( 'bbp_setup_current_user', 'bbp_global_access_role_mask', 10 );
+add_action( 'bbp_setup_current_user', 'bbp_set_current_user_default_role', 10 );
 
 // Widgets
@@ -224 +224 @@
 add_action( 'make_ham_user',  'bbp_make_ham_user'  );
 add_action( 'make_spam_user', 'bbp_make_spam_user' );
-
-// User role
-add_action( 'bbp_new_topic', 'bbp_global_access_auto_role' );
-add_action( 'bbp_new_reply', 'bbp_global_access_auto_role' );
 
 // Caches

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

@@ -751 +751 @@
 
 /**
- * Add the default role and mapped bbPress caps to the current user if needed
+ * Add the default role to the current user if needed
  *
  * This function will bail if the forum is not global in a multisite
  * installation of WordPress, or if the user is marked as spam or deleted.
- *
- * Note that we do not currently add a capability for the default role of the
- * site. This is to prevent unauthorized role-based access, since we have no
- * idea what plugins might be doing to that role. This may change in the future,
- * so it's best not to rely heavily on this for now.
  *
  * @since bbPress (r3380)
@@ -768 +763 @@
  * @uses current_user_can()
  * @uses get_option()
- * @uses bbp_get_caps_for_role()
  *
  * @return If not multisite, not global, or user is deleted/spammed
  */
-function bbp_global_access_role_mask() {
+function bbp_set_current_user_default_role() {
 
     // Bail if forum is not global
@@ -786 +780 @@
         return;
 
-    // Assign the role and mapped caps to the current user
+    // Assign the default role to the current user
     bbpress()->current_user->set_role( get_option( 'default_role', 'subscriber' ) );
 }