Changeset 2702 for trunk/wp-includes/pluggable-functions.php

Timestamp:

07/09/2005 01:27:46 AM (21 years ago)

Author:

matt

Message:

Massive user_level fix. We were still using the user_level field in wp_users in some places, where we should just use the table prefixed usermeta value.

File:

• trunk/wp-includes/pluggable-functions.php (modified) (3 diffs)

trunk/wp-includes/pluggable-functions.php

@@ -7 +7 @@
 if ( !function_exists('get_currentuserinfo') ) :
 function get_currentuserinfo() {
-    global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity;
+    global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity, $current_user;
 
     if ( !isset($_COOKIE['wordpressuser_' . COOKIEHASH])) 
@@ -18 +18 @@
     $user_email  = $userdata->user_email;
     $user_url    = $userdata->user_url;
-
     $user_pass_md5 = md5($userdata->user_pass);
-
     $user_identity = $userdata->display_name;
+    $current_user  = $userdata;
 }
 endif;
@@ -40 +39 @@
     $metavalues = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user_id'");
 
-    foreach ( $metavalues as $meta )
+    foreach ( $metavalues as $meta ) {
         $user->{$meta->meta_key} = $meta->meta_value;
+        // We need to set user_level from meta, not row
+        if ( $wpdb->prefix . 'user_level' == $meta->meta_key )
+            $user->user_level = $meta->meta_value;
+    }
 
     $cache_userdata[$user_id] = $user;