WordPress.org

Make WordPress Core

Ticket #14772: adminbarfixes.2.diff

File adminbarfixes.2.diff, 9.8 KB (added by markmcwilliams, 3 years ago)

with the /user/ code going in, some admin bar code was changed, patch running with latest trunk

  • wp-includes/admin-bar.php

     
    102102add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_account_menu', 20 ); 
    103103 
    104104/** 
    105  * Use the $wp_admin_bar global to add the "My Blogs/[Blog Name]" menu and all submenus. 
     105 * Use the $wp_admin_bar global to add the "My Sites/[Site Name]" menu and all submenus. 
    106106 */ 
    107107function wp_admin_bar_my_blogs_menu() { 
    108108        global $wpdb, $wp_admin_bar; 
    … …  
    110110        if ( !is_object( $wp_admin_bar ) ) 
    111111                return false; 
    112112 
    113         /* Add the 'My Dashboards' menu if the user has more than one blog. */ 
     113        /* Add the 'My Dashboards' menu if the user has more than one site. */ 
    114114        if ( count( $wp_admin_bar->user->blogs ) > 1 ) { 
    115                 $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Blogs' ), 'href' => $wp_admin_bar->user->account_domain ) ); 
     115                $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Sites' ), 'href' => $wp_admin_bar->user->account_domain ) ); 
    116116 
    117117                $default = includes_url('images/wpmini-blue.png'); 
    118118 
    … …  
    137137                                $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-d', 'title' => __( 'Dashboard' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/' ) ); 
    138138                                $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-n', 'title' => __( 'New Post' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/post-new.php' ) ); 
    139139                                // @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' => __( 'Blog Stats' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/index.php?page=stats' ) ); 
     140                                //$wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-s', 'title' => __( 'Site Stats' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/index.php?page=stats' ) ); 
    141141                                $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-c', 'title' => __( 'Manage Comments' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/edit-comments.php' ) ); 
    142                                 $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Read Blog' ), 'href' => constant( 'PROTO' ) . $blogdomain ) ); 
     142                                $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Read Site' ), 'href' => constant( 'PROTO' ) . $blogdomain ) ); 
    143143                        } 
    144144                        $counter++; 
    145145                } 
    146146 
    147                 /* Add the "Manage Blogs" menu item */ 
    148                 // @todo, use dashboard blog. 
    149                 $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'manage-blogs', 'title' => __( 'Manage Blogs' ), admin_url('my-sites.php') ) ); 
     147                /* Add the "Manage Sites" menu item */ 
     148                // @todo, use dashboard site. 
     149                $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'manage-blogs', 'title' => __( 'Manage Sites' ), admin_url('my-sites.php') ) ); 
    150150 
    151         /* Add the 'My Dashboard' menu if the user only has one blog. */ 
     151        /* Add the 'My Dashboard' menu if the user only has one site. */ 
    152152        } else { 
    153                 $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Blog' ), 'href' => $wp_admin_bar->user->account_domain ) ); 
     153                $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Site' ), 'href' => $wp_admin_bar->user->account_domain ) ); 
    154154 
    155155                $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-d', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) ); 
    156156                $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-n', 'title' => __( 'New Post' ), 'href' => admin_url('post-new.php') ) ); 
    157157                // @todo Stats plugins should add this. 
    158                 //$wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-s', 'title' => __( 'Blog Stats' ), 'href' => admin_ur;('index.php?page=stats') ) ); 
     158                //$wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-s', 'title' => __( 'Site Stats' ), 'href' => admin_ur;('index.php?page=stats') ) ); 
    159159                $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-c', 'title' => __( 'Manage Comments' ), 'href' => admin_url('edit-comments.php') ) ); 
    160                 $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-v', 'title' => __( 'Read Blog' ), 'href' => home_url() ) ); 
     160                $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-v', 'title' => __( 'Read Site' ), 'href' => home_url() ) ); 
    161161        } 
    162162} 
    163163add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_blogs_menu', 30 ); 
    164164 
    165165/** 
    166  * Show the blavatar of the current blog as a separator. 
     166 * Show the blavatar of the current site as a separator. 
    167167 */ 
    168168function wp_admin_bar_blog_separator() { 
    169169        global $wp_admin_bar, $current_user, $current_blog; 
    … …  
    173173 
    174174        $default = includes_url('images/wpmini-blue.png'); 
    175175 
    176         $wp_admin_bar->add_menu( array( 'id' => 'blog', 'title' => '<img class="avatar" src="' . $default . '" alt="' . __( 'Current blog avatar' ) . '" width="16" height="16" />', 'href' => home_url() ) ); 
     176        $wp_admin_bar->add_menu( array( 'id' => 'blog', 'title' => '<img class="avatar" src="' . $default . '" alt="' . __( 'Current site avatar' ) . '" width="16" height="16" />', 'href' => home_url() ) ); 
    177177} 
    178178add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_blog_separator', 40 ); 
    179179 
    180180/** 
    181  * Use the $wp_admin_bar global to add a menu for blog info, accessable to all users. 
     181 * Use the $wp_admin_bar global to add a menu for site info, accessable to all users. 
    182182 */ 
    183183function wp_admin_bar_bloginfo_menu() { 
    184184        global $wp_admin_bar; 
    … …  
    186186        if ( !is_object( $wp_admin_bar ) ) 
    187187                return false; 
    188188 
    189         /* Add the Blog Info menu */ 
    190         $wp_admin_bar->add_menu( array( 'id' => 'bloginfo', 'title' => __( 'Blog Info' ), 'href' => '' ) ); 
     189        /* Add the Site Info menu */ 
     190        $wp_admin_bar->add_menu( array( 'id' => 'bloginfo', 'title' => __( 'Site Info' ), 'href' => '' ) ); 
    191191 
    192192        $wp_admin_bar->add_menu( array( 'parent' => 'bloginfo', 'title' => __( 'Get Shortlink' ), 'href' => '', 'meta' => array( 'onclick' => 'javascript:function wpcomshort() { var url=document.location;var links=document.getElementsByTagName(&#39;link&#39;);var found=0;for(var i = 0, l; l = links[i]; i++){if(l.getAttribute(&#39;rel&#39;)==&#39;shortlink&#39;) {found=l.getAttribute(&#39;href&#39;);break;}}if (!found) {for (var i = 0; l = document.links[i]; i++) {if (l.getAttribute(&#39;rel&#39;) == &#39;shortlink&#39;) {found = l.getAttribute(&#39;href&#39;);break;}}}if (found) {prompt(&#39;URL:&#39;, found);} else {alert(&#39;No shortlink available for this page&#39;); } } wpcomshort(); return false;' ) ) ); 
    193193} 
    … …  
    332332} 
    333333add_filter('locale', 'wp_admin_bar_lang'); 
    334334 
    335 ?> 
     335?> 
     336 No newline at end of file 

  • wp-includes/admin-bar/admin-bar-superadmin.php

     
    2929 
    3030        wp_admin_bar_build_snackmenu(); 
    3131 
    32         /* Get the settings we need for the current blog */ 
     32        /* Get the settings we need for the current site */ 
    3333        $matureaction = $current_blog->mature ? 'unmatureblog' : 'matureblog'; 
    3434        $maturetext = $current_blog->mature ? esc_attr__('Unmark as mature') : esc_attr__('Mark as mature'); 
    35         $suspendtext = $current_blog->spam ? esc_attr('Unsuspend blog') : esc_attr('Suspend blog'); 
     35        $suspendtext = $current_blog->spam ? esc_attr('Unsuspend site') : esc_attr('Suspend site'); 
    3636        $suspendaction = $current_blog->spam ? 'unspamblog' : 'spamblog'; 
    37         $mature_url = admin_url( "ms-edit.php?action=confirm&amp;action2={$matureaction}&amp;id={$current_blog->blog_id}&amp;msg=" . urlencode( 'Are you sure you want to ' . strtolower( $maturetext ) . " {$current_blog->domain} as mature?" ) ); 
    38         $suspend_url = admin_url( "ms-edit.php?action=confirm&amp;action2={$suspendaction}&amp;id={$current_blog->blog_id}&amp;msg=" . urlencode( 'Are you sure you want to ' . strtolower( $suspendtext ) . " {$current_blog->domain} ?" ) ); 
     37        $mature_url = network_admin_url( "edit.php?action=confirm&amp;action2={$matureaction}&amp;id={$current_blog->blog_id}&amp;msg=" . urlencode( 'Are you sure you want to ' . strtolower( $maturetext ) . " {$current_blog->domain} as mature?" ) ); 
     38        $suspend_url = network_admin_url( "edit.php?action=confirm&amp;action2={$suspendaction}&amp;id={$current_blog->blog_id}&amp;msg=" . urlencode( 'Are you sure you want to ' . strtolower( $suspendtext ) . " {$current_blog->domain} ?" ) ); 
    3939 
    4040        /* Add the submenu items to the Super Admin menu */ 
    41         $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( 'Blog Dashboard' ), 'href' => admin_url(), 'position' => 10 ) ); 
    42         $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( 'Blog Options' ),  'href' => admin_url( "ms-sites.php?action=blogs&amp;searchaction=id&amp;s={$current_blog->blog_id}" ), 'position' => 30 ) ); 
     41        $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( 'Site Dashboard' ), 'href' => admin_url(), 'position' => 10 ) ); 
     42        $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( 'Site Options' ),  'href' => network_admin_url( "sites.php?action=blogs&amp;searchaction=id&amp;s={$current_blog->blog_id}" ), 'position' => 30 ) ); 
    4343        $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => "$maturetext", 'href' => $mature_url, 'position' => 50 ) ); 
    4444        $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => "$suspendtext", 'href' => $suspend_url, 'position' => 80 ) ); 
    4545} 
    … …  
    153153        return (object) $stats; 
    154154} 
    155155 
    156 ?> 
     156?> 
     157 No newline at end of file