Changeset 3102 for trunk/wp-includes/capabilities.php

Timestamp:

11/16/2005 02:54:23 AM (20 years ago)

Author:

ryan

Message:

Pull the values in WP_User::data directly into WP_User so that we don't have to do ->data->blah.

File:

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

trunk/wp-includes/capabilities.php

@@ -124 +124 @@
             return;
 
-        $this->id = $this->data->ID;
+        foreach (get_object_vars($this->data) as $key => $value) {
+            $this->{$key} = $value;
+        }
+
+        $this->id = $this->ID;
         $this->cap_key = $table_prefix . 'capabilities';
-        $this->caps = &$this->data->{$this->cap_key};
+        $this->caps = &$this->{$this->cap_key};
         if ( ! is_array($this->caps) )
             $this->caps = array();
@@ -183 +187 @@
     function update_user_level_from_caps() {
         global $table_prefix;
-        $this->data->user_level = array_reduce(array_keys($this->allcaps),  array(&$this, 'level_reduction'), 0);
-        update_usermeta($this->id, $table_prefix.'user_level', $this->data->user_level);
+        $this->user_level = array_reduce(array_keys($this->allcaps),    array(&$this, 'level_reduction'), 0);
+        update_usermeta($this->id, $table_prefix.'user_level', $this->user_level);
     }