Make WordPress Core

Changeset 16308


Ignore:
Timestamp:
11/11/2010 06:48:38 PM (13 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/admin-bar.php

    r16302 r16308  
    106106 * @since 3.1.0
    107107 */
    108 function wp_admin_bar_my_blogs_menu() {
     108function wp_admin_bar_my_sites_menu() {
    109109    global $wpdb, $wp_admin_bar;
    110110
     
    118118
    119119    foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
    120         $blogdomain = preg_replace( '!^https?://!', '', $blog->siteurl );
    121120        // @todo Replace with some favicon lookup.
    122121        //$blavatar = '<img src="' . esc_url( blavatar_url( blavatar_domain( $blog->siteurl ), 'img', 16, $default ) ) . '" alt="Blavatar" width="16" height="16" />';
     
    133132
    134133        if ( ! isset( $blog->visible ) || $blog->visible === true ) {
    135             $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/', ) );
    136             $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/', ) );
    137             $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', ) );
    138 
    139             // @todo, stats plugins should add this:
    140             //$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' ) );
    141            
    142             $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', ) );
    143             $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, ) );
     134            $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname,  'href' => get_admin_url($blog->userblog_id), ) );
     135            $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), ) );
     136            $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'), ) );
     137
     138            $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'), ) );
     139            $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), ) );
    144140        }
    145141    }
  • trunk/wp-includes/class-wp-admin-bar.php

    r16162 r16308  
    174174        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_me_separator', 10 );
    175175        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_account_menu', 20 );
    176         add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_blogs_menu', 30 );
     176        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_sites_menu', 30 );
    177177        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_edit_menu', 40 );
    178178        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_new_content_menu', 50 );
Note: See TracChangeset for help on using the changeset viewer.