<!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>[15760] trunk/wp-includes: Standardise on ->user->domain and ->user->
account_domain being trailingslash'd.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15760">15760</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-10-09 05:25:09 +0000 (Sat, 09 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Standardise on ->user->domain and ->user->account_domain being trailingslash'd. See <a href="http://trac.wordpress.org/ticket/14772">#14772</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesadminbaradminbarclassphp">trunk/wp-includes/admin-bar/admin-bar-class.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesadminbaradminbarclassphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar/admin-bar-class.php (15759 => 15760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar/admin-bar-class.php 2010-10-09 02:11:10 UTC (rev 15759)
+++ trunk/wp-includes/admin-bar/admin-bar-class.php 2010-10-09 05:25:09 UTC (rev 15760)
</span><span class="lines">@@ -19,8 +19,8 @@
</span><span class="cx"> $this->user->account_domain = $this->user->domain;
</span><span class="cx"> } else {
</span><span class="cx"> $this->user->active_blog = $this->user->blogs[$blog_id];
</span><del>- $this->user->domain = home_url();
- $this->user->account_domain = home_url();
</del><ins>+ $this->user->domain = trailingslashit( home_url() );
+ $this->user->account_domain = $this->user->domain;
</ins><span class="cx"> }
</span><span class="cx"> $this->user->locale = get_locale();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (15759 => 15760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2010-10-09 02:11:10 UTC (rev 15759)
+++ trunk/wp-includes/admin-bar.php 2010-10-09 05:25:09 UTC (rev 15760)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> if ( !is_object( $wp_admin_bar ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $wp_admin_bar->add_menu( array( 'id' => 'me', 'title' => get_avatar( $current_user->ID, 16 ), 'href' => $wp_admin_bar->user->account_domain . '/wp-admin/profile.php' ) );
</del><ins>+ $wp_admin_bar->add_menu( array( 'id' => 'me', 'title' => get_avatar( $current_user->ID, 16 ), 'href' => $wp_admin_bar->user->account_domain . 'wp-admin/profile.php' ) );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_me_separator', 10 );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>