From f8be3f9fd18fd4d763233054a9f4a79826fa5ff5 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Sat, 9 Oct 2010 05:25:09 +0000 Subject: [PATCH] Standardise on ->user->domain and ->user->account_domain being trailingslash'd. See #14772 git-svn-id: https://develop.svn.wordpress.org/trunk@15760 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/admin-bar.php | 2 +- wp-includes/admin-bar/admin-bar-class.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 3a05c89294..1204012377 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -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 ); diff --git a/wp-includes/admin-bar/admin-bar-class.php b/wp-includes/admin-bar/admin-bar-class.php index 5b9774b228..2de9da71f3 100644 --- a/wp-includes/admin-bar/admin-bar-class.php +++ b/wp-includes/admin-bar/admin-bar-class.php @@ -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(); }