Changeset 4293

Timestamp:

11/02/2012 07:07:41 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Introduce bbp_get_wp_roles() and use in place of $wp_roles global.
• See #1939.

File:

• trunk/includes/core/capabilities.php (modified) (4 diffs)

trunk/includes/core/capabilities.php

@@ -544 +544 @@
  */
 function bbp_add_caps() {
-    global $wp_roles;
-
-    // Load roles if not set
-    if ( ! isset( $wp_roles ) )
-        $wp_roles = new WP_Roles();
 
     // Loop through available roles and add caps
-    foreach( $wp_roles->role_objects as $role ) {
+    foreach( bbp_get_wp_roles()->role_objects as $role ) {
         foreach ( bbp_get_caps_for_role( $role->name ) as $cap => $value ) {
             $role->add_cap( $cap, $value );
@@ -566 +561 @@
  */
 function bbp_remove_caps() {
-    global $wp_roles;
-
-    // Load roles if not set
-    if ( ! isset( $wp_roles ) )
-        $wp_roles = new WP_Roles();
 
     // Loop through available roles and remove caps
-    foreach( $wp_roles->role_objects as $role ) {
+    foreach( bbp_get_wp_roles()->role_objects as $role ) {
         foreach ( array_keys( bbp_get_caps_for_role( $role->name ) ) as $cap ) {
             $role->remove_cap( $cap );
@@ -582 +572 @@
 }
 
-/** Forum Roles ***************************************************************/
-
-/**
- * Add the bbPress roles to the $wp_roles global.
- *
- * We do this to avoid adding these values to the database.
- *
- * @since bbPress (rxxxx)
- * @global type $wp_roles
- */
-function bbp_add_forums_roles() {
-    global $wp_roles, $wp_user_roles;
-
+/**
+ * Get the $wp_roles global without needing to declare it everywhere
+ *
+ * @since bbPress (r4293)
+ *
+ * @global WP_Roles $wp_roles
+ * @return WP_Roles
+ */
+function bbp_get_wp_roles() {
+    global $wp_roles;
+
+    // Load roles if not set
     if ( ! isset( $wp_roles ) )
         $wp_roles = new WP_Roles();
 
-    // Loop through bbPress's roles and add them to the global $wp_roles
-    foreach( bbp_get_forums_editable_roles() as $role_id => $details ) {
+    return $wp_roles;
+}
+
+/** Forum Roles ***************************************************************/
+
+/**
+ * Add the bbPress roles to the $wp_roles global.
+ *
+ * We do this to avoid adding these values to the database.
+ *
+ * @since bbPress (r4290)
+ */
+function bbp_add_forums_roles() {
+    $wp_roles = bbp_get_wp_roles();
+
+    foreach( bbp_get_editable_roles() as $role_id => $details ) {
         $wp_roles->roles[$role_id]        = $details;
         $wp_roles->role_objects[$role_id] = new WP_Role( $details['name'], $details['capabilities'] );
         $wp_roles->role_names[$role_id]   = $details['name'];
     }
-
-    // Force WordPress not to use the DB
-    $wp_user_roles = $wp_roles;
 }
 
@@ -626 +626 @@
  * @return array
  */
-function bbp_get_forums_editable_roles() {
-    return (array) apply_filters( 'bbp_get_forums_editable_roles', array(
+function bbp_get_editable_roles() {
+    return (array) apply_filters( 'bbp_get_editable_roles', array(
 
         // Keymaster