Changeset 15760

Timestamp:

10/09/2010 05:25:09 AM (14 years ago)

Author:

dd32

Message:

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

Location:

trunk/wp-includes

Files:

• admin-bar.php (modified) (1 diff)
• admin-bar/admin-bar-class.php (modified) (1 diff)

trunk/wp-includes/admin-bar.php

@@ -79 +79 @@
         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 );

trunk/wp-includes/admin-bar/admin-bar-class.php

@@ -20 +20 @@
         } 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();