<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14321] trunk/wp-includes/user.php:
Replace dashes with empty strings instead of underscores so that keys match keys that might be stored in a persistent cache from 2
.9.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14321">14321</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-04-30 17:57:30 +0000 (Fri, 30 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (14320 => 14321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-04-30 17:37:42 UTC (rev 14320)
+++ trunk/wp-includes/user.php 2010-04-30 17:57:30 UTC (rev 14321)
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> $user = get_userdata($user);
</span><span class="cx">
</span><span class="cx"> // Keys used as object vars cannot have dashes.
</span><del>- $key = str_replace('-', '_', $option);
</del><ins>+ $key = str_replace('-', '', $option);
</ins><span class="cx">
</span><span class="cx"> if ( isset( $user->{$wpdb->prefix . $key} ) ) // Blog specific
</span><span class="cx"> $result = $user->{$wpdb->prefix . $key};
</span><span class="lines">@@ -702,7 +702,7 @@
</span><span class="cx"> foreach ( $metavalues as $meta ) {
</span><span class="cx"> $value = maybe_unserialize($meta->meta_value);
</span><span class="cx"> // Keys used as object vars cannot have dashes.
</span><del>- $key = str_replace('-', '_', $meta->meta_key);
</del><ins>+ $key = str_replace('-', '', $meta->meta_key);
</ins><span class="cx"> $user->{$key} = $value;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -881,16 +881,8 @@
</span><span class="cx"> * @param int $id User ID
</span><span class="cx"> */
</span><span class="cx"> function clean_user_cache($id) {
</span><del>- global $current_user;
-
</del><span class="cx"> $user = new WP_User($id);
</span><span class="cx">
</span><del>- // If the current user changed, reset the current_user global.\x8C
- if ( isset($current_user) && $current_user->ID == $id ) {
- $current_user->ID = -1; // Force wp_set_current_user to reset.
- wp_set_current_user($id);
- }
-
</del><span class="cx"> wp_cache_delete($id, 'users');
</span><span class="cx"> wp_cache_delete($user->user_login, 'userlogins');
</span><span class="cx"> wp_cache_delete($user->user_email, 'useremail');
</span></span></pre>
</div>
</div>
</body>
</html>