Changeset 3452

Timestamp:

01/18/2006 01:06:11 AM (20 years ago)

Author:

ryan

Message:

wp_roles cleanup.

Location:

trunk

Files:

• wp-includes/capabilities.php (modified) (8 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/capabilities.php

@@ -86 +86 @@
         global $wp_roles;
 
+        if ( ! isset($wp_roles) )
+            $wp_roles = new WP_Roles();
+
         $this->capabilities[$cap] = $grant;
         $wp_roles->add_cap($this->name, $cap, $grant);
@@ -92 +95 @@
     function remove_cap($cap) {
         global $wp_roles;
+
+        if ( ! isset($wp_roles) )
+            $wp_roles = new WP_Roles();
 
         unset($this->capabilities[$cap]);
@@ -116 +122 @@
 
     function WP_User($id, $name = '') {
-        global $wp_roles, $table_prefix;
+        global $table_prefix;
 
         if ( empty($id) && empty($name) )
@@ -148 +154 @@
     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
         if(is_array($this->caps))
@@ -215 +225 @@
     //has_cap('edit_post', post_id)
     function has_cap($cap) {
-        global $wp_roles;
-
         if ( is_numeric($cap) )
             $cap = $this->translate_level_to_cap($cap);
@@ -317 +325 @@
     global $wp_roles;
 
+    if ( ! isset($wp_roles) )
+        $wp_roles = new WP_Roles();
+
     return $wp_roles->get_role($role);
 }
@@ -323 +334 @@
     global $wp_roles;
 
+    if ( ! isset($wp_roles) )
+        $wp_roles = new WP_Roles();
+
     return $wp_roles->add_role($role, $display_name, $capabilities = '');
 }
@@ -328 +342 @@
 function remove_role($role) {
     global $wp_roles;
+
+    if ( ! isset($wp_roles) )
+        $wp_roles = new WP_Roles();
 
     return $wp_roles->remove_role($role);

trunk/wp-settings.php

@@ -207 +207 @@
 $wp_rewrite = new WP_Rewrite();
 $wp         = new WP();
-$wp_roles   = new WP_Roles();
 
 define('TEMPLATEPATH', get_template_directory());