golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Standardise on ->user->domain and ->user->account_domain being trailingslash'd. See #14772 

git-svn-id: http://svn.automattic.com/wordpress/trunk@15760 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-10-09 05:25:09 +00:00
parent c366abf045
commit 089b75c67d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/admin-bar.php
View File

@ -78,7 +78,7 @@ function wp_admin_bar_me_separator() {
if ( !is_object( $wp_admin_bar ) )
return false;
$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' ) );
$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' ) );
}
add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_me_separator', 10 );

4
wp-includes/admin-bar/admin-bar-class.php
View File

@ -19,8 +19,8 @@ class WP_Admin_Bar {
$this->user->account_domain = $this->user->domain;
} else {
$this->user->active_blog = $this->user->blogs[$blog_id];
$this->user->domain = home_url();
$this->user->account_domain = home_url();
$this->user->domain = trailingslashit( home_url() );
$this->user->account_domain = $this->user->domain;
}
$this->user->locale = get_locale();
}