<!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" />
<title>[19284] trunk: Don't use $user_identity global.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19284">19284</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-11-14 21:35:44 +0000 (Mon, 14 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use $user_identity global. props duck_. fixes <a href="http://core.trac.wordpress.org/ticket/19146">#19146</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminheaderphp">trunk/wp-admin/admin-header.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-header.php (19283 => 19284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php 2011-11-14 21:32:56 UTC (rev 19283)
+++ trunk/wp-admin/admin-header.php 2011-11-14 21:35:44 UTC (rev 19284)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">
</span><span class="cx"> // In case admin-header.php is included in a function.
</span><span class="cx"> global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version, $is_iphone,
</span><del>- $user_identity, $current_site, $update_title, $total_update_count, $parent_file;
</del><ins>+ $current_site, $update_title, $total_update_count, $parent_file;
</ins><span class="cx">
</span><span class="cx"> get_admin_page_title();
</span><span class="cx"> $title = esc_html( strip_tags( $title ) );
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (19283 => 19284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2011-11-14 21:32:56 UTC (rev 19283)
+++ trunk/wp-includes/admin-bar.php 2011-11-14 21:35:44 UTC (rev 19284)
</span><span class="lines">@@ -134,16 +134,14 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx"> function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
</span><del>- global $user_identity;
-
</del><span class="cx"> $user_id = get_current_user_id();
</span><span class="cx"> $current_user = wp_get_current_user();
</span><span class="cx"> $profile_url = get_edit_profile_url( $user_id );
</span><span class="cx">
</span><span class="cx"> if ( 0 != $user_id ) {
</span><del>- /* Add the 'My Account' menu */
</del><ins>+ /* Add the "My Account" menu */
</ins><span class="cx"> $avatar = get_avatar( $user_id, 28 );
</span><del>- $howdy = sprintf( __('Howdy, %1$s'), $user_identity );
</del><ins>+ $howdy = sprintf( __('Howdy, %1$s'), $current_user->display_name );
</ins><span class="cx"> $class = empty( $avatar ) ? '' : 'with-avatar';
</span><span class="cx">
</span><span class="cx"> $wp_admin_bar->add_menu( array(
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (19283 => 19284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2011-11-14 21:32:56 UTC (rev 19283)
+++ trunk/wp-includes/comment-template.php 2011-11-14 21:35:44 UTC (rev 19284)
</span><span class="lines">@@ -1508,7 +1508,7 @@
</span><span class="cx"> * @return void
</span><span class="cx"> */
</span><span class="cx"> function comment_form( $args = array(), $post_id = null ) {
</span><del>- global $user_identity, $id;
</del><ins>+ global $id;
</ins><span class="cx">
</span><span class="cx"> if ( null === $post_id )
</span><span class="cx"> $post_id = $id;
</span><span class="lines">@@ -1516,6 +1516,8 @@
</span><span class="cx"> $id = $post_id;
</span><span class="cx">
</span><span class="cx"> $commenter = wp_get_current_commenter();
</span><ins>+ $user = wp_get_current_user();
+ $user_identity = ! empty( $user->ID ) ? $user->display_name : '';
</ins><span class="cx">
</span><span class="cx"> $req = get_option( 'require_name_email' );
</span><span class="cx"> $aria_req = ( $req ? " aria-required='true'" : '' );
</span></span></pre>
</div>
</div>
</body>
</html>