<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[18927] trunk/wp-includes: Improve admin bar item order for W menu, add new menu, and edit content item.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18927">18927</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2011-10-10 18:40:00 +0000 (Mon, 10 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve admin bar item order for W menu, add new menu, and edit content item. see <a href="http://core.trac.wordpress.org/ticket/18197">#18197</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludesclasswpadminbarphp">trunk/wp-includes/class-wp-admin-bar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (18926 => 18927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2011-10-10 04:19:05 UTC (rev 18926)
+++ trunk/wp-includes/admin-bar.php 2011-10-10 18:40:00 UTC (rev 18927)
</span><span class="lines">@@ -117,6 +117,14 @@
</span><span class="cx"> ),
</span><span class="cx"> ) );
</span><span class="cx">
</span><ins>+ // Add WordPress.org link
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'wp-logo-secondary',
+ 'id' => 'wporg',
+ 'title' => __('WordPress.org'),
+ 'href' => 'http://wordpress.org',
+ ) );
+
</ins><span class="cx"> // Add codex link
</span><span class="cx"> $wp_admin_bar->add_menu( array(
</span><span class="cx"> 'parent' => 'wp-logo-secondary',
</span><span class="lines">@@ -125,14 +133,6 @@
</span><span class="cx"> 'href' => 'http://codex.wordpress.org',
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- // Add feedback link
- $wp_admin_bar->add_menu( array(
- 'parent' => 'wp-logo-secondary',
- 'id' => 'feedback',
- 'title' => __('Feedback'),
- 'href' => 'http://wordpress.org/support/forum/requests-and-feedback',
- ) );
-
</del><span class="cx"> // Add forums link
</span><span class="cx"> $wp_admin_bar->add_menu( array(
</span><span class="cx"> 'parent' => 'wp-logo-secondary',
</span><span class="lines">@@ -141,12 +141,12 @@
</span><span class="cx"> 'href' => 'http://wordpress.org/support/',
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- // Add WordPress.org link
</del><ins>+ // Add feedback link
</ins><span class="cx"> $wp_admin_bar->add_menu( array(
</span><span class="cx"> 'parent' => 'wp-logo-secondary',
</span><del>- 'id' => 'wporg',
- 'title' => __('WordPress.org'),
- 'href' => 'http://wordpress.org',
</del><ins>+ 'id' => 'feedback',
+ 'title' => __('Feedback'),
+ 'href' => 'http://wordpress.org/support/forum/requests-and-feedback',
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -465,12 +465,11 @@
</span><span class="cx"> function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
</span><span class="cx"> $primary = $secondary = array();
</span><span class="cx">
</span><del>- 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;
</del><ins>+ $cpts = (array) get_post_types( array( 'show_in_admin_bar' => true ), 'objects' );
</ins><span class="cx">
</span><del>- $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 );
</del><ins>+ 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'] );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( current_user_can( 'upload_files' ) )
</span><span class="lines">@@ -479,15 +478,23 @@
</span><span class="cx"> if ( current_user_can( 'manage_links' ) )
</span><span class="cx"> $primary[ 'link-add.php' ] = array( _x( 'Link', 'add new from admin bar' ), 'new-link' );
</span><span class="cx">
</span><ins>+ 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 );
+ }
+
</ins><span class="cx"> if ( current_user_can( 'create_users' ) || current_user_can( 'promote_users' ) )
</span><span class="cx"> $secondary[ 'user-new.php' ] = array( _x( 'User', 'add new from admin bar' ), 'new-user' );
</span><span class="cx">
</span><del>- 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' );
-
</del><span class="cx"> if ( ! $primary && ! $secondary )
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesclasswpadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-admin-bar.php (18926 => 18927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-admin-bar.php 2011-10-10 04:19:05 UTC (rev 18926)
+++ trunk/wp-includes/class-wp-admin-bar.php 2011-10-10 18:40:00 UTC (rev 18927)
</span><span class="lines">@@ -183,10 +183,10 @@
</span><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 40 );
</span><span class="cx">
</span><span class="cx"> // Content related.
</span><del>- add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 50 );
</del><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 60 );
</span><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 70 );
</span><del>- add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 80 );
</del><ins>+ add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
+ add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 90 );
</ins><span class="cx">
</span><span class="cx"> if ( ! is_admin() ) {
</span><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_search_menu', 100 );
</span></span></pre>
</div>
</div>
</body>
</html>