WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: http://svn.automattic.com/wordpress/trunk@14321 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-04-30 17:57:30 +00:00
parent 4a1e7550a3
commit b1d6ee584a
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/user.php
View File

@ -244,7 +244,7 @@ function get_user_option( $option, $user = 0, $deprecated = '' ) {
$user = get_userdata($user); $user = get_userdata($user);
// Keys used as object vars cannot have dashes. // Keys used as object vars cannot have dashes.
$key = str_replace('-', '_', $option); $key = str_replace('-', '', $option);
if ( isset( $user->{$wpdb->prefix . $key} ) ) // Blog specific if ( isset( $user->{$wpdb->prefix . $key} ) ) // Blog specific
$result = $user->{$wpdb->prefix . $key}; $result = $user->{$wpdb->prefix . $key};
@ -702,7 +702,7 @@ function _fill_single_user( &$user, &$metavalues ) {
foreach ( $metavalues as $meta ) { foreach ( $metavalues as $meta ) {
$value = maybe_unserialize($meta->meta_value); $value = maybe_unserialize($meta->meta_value);
// Keys used as object vars cannot have dashes. // Keys used as object vars cannot have dashes.
$key = str_replace('-', '_', $meta->meta_key); $key = str_replace('-', '', $meta->meta_key);
$user->{$key} = $value; $user->{$key} = $value;
} }
@ -881,16 +881,8 @@ function update_user_caches(&$user) {
* @param int $id User ID * @param int $id User ID
*/ */
function clean_user_cache($id) { function clean_user_cache($id) {
global $current_user;
$user = new WP_User($id); $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($id, 'users');
wp_cache_delete($user->user_login, 'userlogins'); wp_cache_delete($user->user_login, 'userlogins');
wp_cache_delete($user->user_email, 'useremail'); wp_cache_delete($user->user_email, 'useremail');