Changeset 5827 for trunk/src/includes/core/capabilities.php

Timestamp:

07/14/2015 12:31:42 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Abstraction: Use bbp_db(), bbp_rewrite() & friends, introduced in r5823 & r5826.

This commit improves the stability of bbPress in the WordPress environment by reducing global variable exposure. It also comes with minimal opcode improvements in some circumstances where $GLOBALS is preferred over defining via global statements.

Some additional surrounding cleanup directly related to functions & methods being altered is also being performed here.

Fixes #2786.

File:

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

trunk/src/includes/core/capabilities.php

@@ -244 +244 @@
 
 /**
- * Get the $wp_roles global without needing to declare it everywhere
+ * 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();
-    }
-
-    return $wp_roles;
+
+    // Try to get `$wp_roles`
+    $retval = bbp_get_global_object( 'wp_roles', 'WP_Roles' );
+
+    // Set roles if not loaded
+    if ( is_null( $retval ) ) {
+        $retval = $GLOBALS['wp_roles'] = new WP_Roles();
+    }
+
+    return $retval;
 }
 
@@ -273 +274 @@
 
     // Get WordPress's roles (returns $wp_roles global)
-    $wp_roles  = bbp_get_wp_roles();
+    $wp_roles = bbp_get_wp_roles();
 
     // Apply the WordPress 'editable_roles' filter to let plugins ride along.
@@ -302 +303 @@
 
     foreach ( bbp_get_dynamic_roles() as $role_id => $details ) {
-        $wp_roles->roles[$role_id]        = $details;
-        $wp_roles->role_objects[$role_id] = new WP_Role( $role_id, $details['capabilities'] );
-        $wp_roles->role_names[$role_id]   = $details['name'];
+        $wp_roles->roles[ $role_id ]        = $details;
+        $wp_roles->role_objects[ $role_id ] = new WP_Role( $role_id, $details['capabilities'] );
+        $wp_roles->role_names[ $role_id ]   = $details['name'];
     }
 
@@ -316 +317 @@
  *
  * @see _bbp_reinit_dynamic_roles()
- *
- * @global WPDB $wpdb Used to get the database prefix
  */
 function bbp_filter_user_roles_option() {
-    global $wpdb;
-
-    $role_key = $wpdb->prefix . 'user_roles';
+    $role_key = bbp_db()->prefix . 'user_roles';
 
     add_filter( 'option_' . $role_key, '_bbp_reinit_dynamic_roles' );
@@ -419 +416 @@
 function bbp_get_dynamic_role_name( $role_id = '' ) {
     $roles = bbp_get_dynamic_roles();
-    $role  = isset( $roles[$role_id] ) ? $roles[$role_id]['name'] : '';
+    $role  = isset( $roles[ $role_id ] ) ? $roles[ $role_id ]['name'] : '';
 
     return apply_filters( 'bbp_get_dynamic_role_name', $role, $role_id, $roles );
@@ -445 +442 @@
             // If keys match, unset
             if ( $wp_role === $bbp_role ) {
-                unset( $all_roles[$wp_role] );
+                unset( $all_roles[ $wp_role ] );
             }
         }