From d35bf06afa98c397d5ccb8cfface5afb4c6ff1a0 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Fri, 30 Apr 2010 17:57:30 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@14321 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/user.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/wp-includes/user.php b/wp-includes/user.php index 84dc52e10e..4f4b47c2f5 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -244,7 +244,7 @@ function get_user_option( $option, $user = 0, $deprecated = '' ) { $user = get_userdata($user); // Keys used as object vars cannot have dashes. - $key = str_replace('-', '_', $option); + $key = str_replace('-', '', $option); if ( isset( $user->{$wpdb->prefix . $key} ) ) // Blog specific $result = $user->{$wpdb->prefix . $key}; @@ -702,7 +702,7 @@ function _fill_single_user( &$user, &$metavalues ) { foreach ( $metavalues as $meta ) { $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; } @@ -881,16 +881,8 @@ function update_user_caches(&$user) { * @param int $id User ID */ 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'); wp_cache_delete($user->user_login, 'userlogins'); wp_cache_delete($user->user_email, 'useremail');