Ticket #12997: 12997.diff

wp-includes/capabilities.php

@@ -299 +299 @@
         function add_cap( $cap, $grant = true ) {
                 global $wp_roles;
 
-                if ( ! isset( $wp_roles ) )
-                        $wp_roles = new WP_Roles();
-
                 $this->capabilities[$cap] = $grant;
                 $wp_roles->add_cap( $this->name, $cap, $grant );
         }
@@ -322 +319 @@
         function remove_cap( $cap ) {
                 global $wp_roles;
 
-                if ( ! isset( $wp_roles ) )
-                        $wp_roles = new WP_Roles();
-
                 unset( $this->capabilities[$cap] );
                 $wp_roles->remove_cap( $this->name, $cap );
         }
@@ -539 +533 @@
         function get_role_caps() {
                 global $wp_roles;
 
-                if ( ! isset( $wp_roles ) )
-                        $wp_roles = new WP_Roles();
-
-                //Filter out caps that are not role names and assign to $this->roles
+                // Filter out caps that are not role names and assign to $this->roles
                 if ( is_array( $this->caps ) )
                         $this->roles = array_filter( array_keys( $this->caps ), array( &$wp_roles, 'is_role' ) );
 
@@ -1109 +1100 @@
 function get_role( $role ) {
         global $wp_roles;
 
-        if ( ! isset( $wp_roles ) )
-                $wp_roles = new WP_Roles();
-
         return $wp_roles->get_role( $role );
 }
 
@@ -1129 +1117 @@
 function add_role( $role, $display_name, $capabilities = array() ) {
         global $wp_roles;
 
-        if ( ! isset( $wp_roles ) )
-                $wp_roles = new WP_Roles();
-
         return $wp_roles->add_role( $role, $display_name, $capabilities );
 }
 
@@ -1147 +1132 @@
 function remove_role( $role ) {
         global $wp_roles;
 
-        if ( ! isset( $wp_roles ) )
-                $wp_roles = new WP_Roles();
-
         return $wp_roles->remove_role( $role );
 }
 

wp-settings.php

@@ -234 +234 @@
 $wp =& new WP();
 
 /**
+ * WordPress Roles Object
+ * @global object $wp_roles
+ * @since 2.0.0
+ */
+$wp_roles =& new WP_Roles();
+
+/**
  * WordPress Widget Factory Object
  * @global object $wp_widget_factory
  * @since 2.8.0