Changeset 16308

Timestamp:

11/11/2010 06:48:38 PM (14 years ago)

Author:

ryan

Message:

Make the My Sites menu items use admin_url() instead of hardcoding the url. Props caesarsgrunt. see #14772

Location:

trunk/wp-includes

Files:

• admin-bar.php (modified) (3 diffs)
• class-wp-admin-bar.php (modified) (1 diff)

trunk/wp-includes/admin-bar.php

@@ -106 +106 @@
  * @since 3.1.0
  */
-function wp_admin_bar_my_blogs_menu() {
+function wp_admin_bar_my_sites_menu() {
     global $wpdb, $wp_admin_bar;
 
@@ -118 +118 @@
 
     foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
-        $blogdomain = preg_replace( '!^https?://!', '', $blog->siteurl );
         // @todo Replace with some favicon lookup.
         //$blavatar = '<img src="' . esc_url( blavatar_url( blavatar_domain( $blog->siteurl ), 'img', 16, $default ) ) . '" alt="Blavatar" width="16" height="16" />';
@@ -133 +132 @@
 
         if ( ! isset( $blog->visible ) || $blog->visible === true ) {
-            $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname,  'href' => $wp_admin_bar->proto . $blogdomain . '/wp-admin/', ) );
-            $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-d', 'title' => __( 'Dashboard' ), 'href' => $wp_admin_bar->proto . $blogdomain . '/wp-admin/', ) );
-            $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-n', 'title' => __( 'New Post' ), 'href' => $wp_admin_bar->proto . $blogdomain . '/wp-admin/post-new.php', ) );
-
-            // @todo, stats plugins should add this:
-            //$wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-s', 'title' => __( 'Site Stats' ), 'href' => $wp_admin_bar->proto . $blogdomain . '/wp-admin/index.php?page=stats' ) );
-            
-            $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-c', 'title' => __( 'Manage Comments' ), 'href' => $wp_admin_bar->proto . $blogdomain . '/wp-admin/edit-comments.php', ) );
-            $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Visit Site' ), 'href' => $wp_admin_bar->proto . $blogdomain, ) );
+            $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname,  'href' => get_admin_url($blog->userblog_id), ) );
+            $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-d', 'title' => __( 'Dashboard' ), 'href' => get_admin_url($blog->userblog_id), ) );
+            $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-n', 'title' => __( 'New Post' ), 'href' => get_admin_url($blog->userblog_id, 'post-new.php'), ) );
+
+            $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-c', 'title' => __( 'Manage Comments' ), 'href' => get_admin_url($blog->userblog_id, 'edit-comments.php'), ) );
+            $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Visit Site' ), 'href' => get_home_url($blog->userblog_id), ) );
         }
     }

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

@@ -174 +174 @@
         add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_me_separator', 10 );
         add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_account_menu', 20 );
-        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_blogs_menu', 30 );
+        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_sites_menu', 30 );
         add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_edit_menu', 40 );
         add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_new_content_menu', 50 );