Changeset 14321

Timestamp:

04/30/2010 05:57:30 PM (15 years ago)

Author:

ryan

Message:

Replace dashes with empty strings instead of underscores so that keys match keys that might be stored in a persistent cache from 2.9. Remove current user reset. Kinda buggy.

File:

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

trunk/wp-includes/user.php

@@ -245 +245 @@
 
     // Keys used as object vars cannot have dashes.
-    $key = str_replace('-', '_', $option);
+    $key = str_replace('-', '', $option);
 
     if ( isset( $user->{$wpdb->prefix . $key} ) ) // Blog specific
@@ -703 +703 @@
         $value = maybe_unserialize($meta->meta_value);
         // Keys used as object vars cannot have dashes.
-        $key = str_replace('-', '_', $meta->meta_key);
+        $key = str_replace('-', '', $meta->meta_key);
         $user->{$key} = $value;
     }
@@ -882 +882 @@
  */
 function clean_user_cache($id) {
-    global $current_user;
-
     $user = new WP_User($id);
-
-    // If the current user changed, reset the current_user global.Œ
-    if ( isset($current_user) && $current_user->ID == $id ) {
-        $current_user->ID = -1; // Force wp_set_current_user to reset.
-        wp_set_current_user($id);
-    }
 
     wp_cache_delete($id, 'users');