<!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>[12288] trunk/wp-includes/user.php: Restore functionality of setup_userdata
() when a user id is supplied.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12288">12288</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-11-27 18:17:44 +0000 (Fri, 27 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Restore functionality of setup_userdata() when a user id is supplied. See <a href="http://trac.wordpress.org/ticket/11271">#11271</a> and <a href="http://trac.wordpress.org/ticket/11222">#11222</a>.</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 (12287 => 12288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2009-11-27 12:57:35 UTC (rev 12287)
+++ trunk/wp-includes/user.php 2009-11-27 18:17:44 UTC (rev 12288)
</span><span class="lines">@@ -448,15 +448,15 @@
</span><span class="cx"> * @global string $user_pass_md5 MD5 of the user's password
</span><span class="cx"> * @global string $user_identity The display name of the user
</span><span class="cx"> *
</span><del>- * @param int $user_id Optional. User ID to setup global data.
</del><ins>+ * @param int $for_user_id Optional. User ID to setup global data.
</ins><span class="cx"> */
</span><del>-function setup_userdata($user_id = '') {
</del><ins>+function setup_userdata($for_user_id = '') {
</ins><span class="cx"> global $user_login, $userdata, $user_level, $user_id, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity;
</span><span class="cx">
</span><del>- if ( '' == $user_id )
</del><ins>+ if ( '' == $for_user_id )
</ins><span class="cx"> $user = wp_get_current_user();
</span><span class="cx"> else
</span><del>- $user = new WP_User($user_id);
</del><ins>+ $user = new WP_User($for_user_id);
</ins><span class="cx">
</span><span class="cx"> if ( 0 == $user->ID )
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>