Changeset 18927

Timestamp:

10/10/2011 06:40:00 PM (13 years ago)

Author:

koopersmith

Message:

Improve admin bar item order for W menu, add new menu, and edit content item. see #18197.

Location:

trunk/wp-includes

Files:

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

trunk/wp-includes/admin-bar.php

@@ -118 +118 @@
     ) );
 
+    // Add WordPress.org link
+    $wp_admin_bar->add_menu( array(
+        'parent' => 'wp-logo-secondary',
+        'id'     => 'wporg',
+        'title'  => __('WordPress.org'),
+        'href'   => 'http://wordpress.org',
+    ) );
+
     // Add codex link
     $wp_admin_bar->add_menu( array(
@@ -126 +134 @@
     ) );
 
+    // Add forums link
+    $wp_admin_bar->add_menu( array(
+        'parent' => 'wp-logo-secondary',
+        'id'     => 'support-forums',
+        'title'  => __('Support Forums'),
+        'href'   => 'http://wordpress.org/support/',
+    ) );
+
     // Add feedback link
     $wp_admin_bar->add_menu( array(
@@ -132 +148 @@
         'title'  => __('Feedback'),
         'href'   => 'http://wordpress.org/support/forum/requests-and-feedback',
-    ) );
-
-    // Add forums link
-    $wp_admin_bar->add_menu( array(
-        'parent' => 'wp-logo-secondary',
-        'id'     => 'support-forums',
-        'title'  => __('Support Forums'),
-        'href'   => 'http://wordpress.org/support/',
-    ) );
-
-    // Add WordPress.org link
-    $wp_admin_bar->add_menu( array(
-        'parent' => 'wp-logo-secondary',
-        'id'     => 'wporg',
-        'title'  => __('WordPress.org'),
-        'href'   => 'http://wordpress.org',
     ) );
 }
@@ -466 +466 @@
     $primary = $secondary = array();
 
-    foreach ( (array) get_post_types( array( 'show_in_admin_bar' => true ), 'objects' ) as $ptype_obj ) {
-        if ( ! current_user_can( $ptype_obj->cap->edit_posts ) )
-            continue;
-
-        $key = 'post' == $ptype_obj->name ? 'post-new.php' : 'post-new.php?post_type=' . $ptype_obj->name;
-        $primary[ $key ] = array( $ptype_obj->labels->name_admin_bar, 'new-' . $ptype_obj->name );
+    $cpts = (array) get_post_types( array( 'show_in_admin_bar' => true ), 'objects' );
+
+    if ( isset( $cpts['post'] ) && current_user_can( $cpts['post']->cap->edit_posts ) ) {
+        $primary[ 'post-new.php' ] = array( $cpts['post']->labels->name_admin_bar, 'new-post' );
+        unset( $cpts['post'] );
     }
 
@@ -480 +479 @@
         $primary[ 'link-add.php' ] = array( _x( 'Link', 'add new from admin bar' ), 'new-link' );
 
+    if ( isset( $cpts['page'] ) && current_user_can( $cpts['page']->cap->edit_posts ) ) {
+        $primary[ 'post-new.php?post_type=page' ] = array( $cpts['page']->labels->name_admin_bar, 'new-page' );
+        unset( $cpts['page'] );
+    }
+
+    // Add any additional custom post types.
+    foreach ( $cpts as $cpt ) {
+        if ( ! current_user_can( $cpt->cap->edit_posts ) )
+            continue;
+
+        $key = 'post-new.php?post_type=' . $cpt->name;
+        $primary[ $key ] = array( $cpt->labels->name_admin_bar, 'new-' . $cpt->name );
+    }
+
     if ( current_user_can( 'create_users' ) || current_user_can( 'promote_users' ) )
         $secondary[ 'user-new.php' ] = array( _x( 'User', 'add new from admin bar' ), 'new-user' );
-
-    if ( ! is_multisite() && current_user_can( 'install_themes' ) )
-        $secondary[ 'theme-install.php' ] = array( _x( 'Theme', 'add new from admin bar' ), 'new-theme' );
-
-    if ( ! is_multisite() && current_user_can( 'install_plugins' ) )
-        $secondary[ 'plugin-install.php' ] = array( _x( 'Plugin', 'add new from admin bar' ), 'new-plugin' );
 
     if ( ! $primary && ! $secondary )

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

@@ -184 +184 @@
 
         // Content related.
-        add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 50 );
         add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 60 );
         add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 70 );
-        add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 80 );
+        add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
+        add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 90 );
 
         if ( ! is_admin() ) {