Changeset 4113

Timestamp:

08/24/2006 11:23:36 PM (20 years ago)

Author:

ryan

Message:

Allow use of global roles array instead of options db. Useful for multi-blog setups.

File:

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

trunk/wp-includes/capabilities.php

@@ -7 +7 @@
         var $role_names = array();
         var $role_key;
+        var $use_db = true;
 
         function WP_Roles() {
@@ -14 +15 @@
         function _init () {
                 global $wpdb;
+                global $wp_user_roles;
                 $this->role_key = $wpdb->prefix . 'user_roles';
-
-                $this->roles = get_option($this->role_key);
+                if ( ! empty($wp_user_roles) ) {
+                        $this->roles = $wp_user_roles;
+                        $this->use_db = false;
+                } else {
+                        $this->roles = get_option($this->role_key);
+                }
 
                 if ( empty($this->roles) )
@@ -36 +42 @@
                         'name' => $display_name,
                         'capabilities' => $capabilities);
-                update_option($this->role_key, $this->roles);
+                if ( $this->use_db )
+                        update_option($this->role_key, $this->roles);
                 $this->role_objects[$role] = new WP_Role($role, $capabilities);
                 $this->role_names[$role] = $display_name;
@@ -49 +56 @@
                 unset($this->role_names[$role]);
                 unset($this->roles[$role]);
-
-                update_option($this->role_key, $this->roles);
+                
+                if ( $this->use_db )
+                        update_option($this->role_key, $this->roles);
         }
 
         function add_cap($role, $cap, $grant = true) {
                 $this->roles[$role]['capabilities'][$cap] = $grant;
-                update_option($this->role_key, $this->roles);
+                if ( $this->use_db )
+                        update_option($this->role_key, $this->roles);
         }
 
         function remove_cap($role, $cap) {
                 unset($this->roles[$role]['capabilities'][$cap]);
-                update_option($this->role_key, $this->roles);
+                if ( $this->use_db )
+                        update_option($this->role_key, $this->roles);
         }