<!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>[19230] trunk/wp-includes: Add secondary flag to admin bar.</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/19230">19230</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2011-11-09 19:12:48 +0000 (Wed, 09 Nov 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add secondary flag to admin bar. fixes <a href="http://core.trac.wordpress.org/ticket/19136">#19136</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>
<li><a href="#trunkwpincludescssadminbarcss">trunk/wp-includes/css/admin-bar.css</a></li>
<li><a href="#trunkwpincludescssadminbardevcss">trunk/wp-includes/css/admin-bar.dev.css</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.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 (19229 => 19230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php        2011-11-09 16:46:05 UTC (rev 19229)
+++ trunk/wp-includes/admin-bar.php        2011-11-09 19:12:48 UTC (rev 19230)
</span><span class="lines">@@ -91,46 +91,40 @@
</span><span class="cx">                 ) );
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        // Add secondary menu.
-        $wp_admin_bar-&gt;add_menu( array(
-                'parent' =&gt; 'wp-logo',
-                'id'     =&gt; 'wp-logo-secondary',
-                'title'  =&gt; '&amp;nbsp;',
-                'meta'   =&gt; array(
-                        'class' =&gt; 'secondary',
-                ),
-        ) );
-
</del><span class="cx">         // Add WordPress.org link
</span><span class="cx">         $wp_admin_bar-&gt;add_menu( array(
</span><del>-                'parent' =&gt; 'wp-logo-secondary',
-                'id'     =&gt; 'wporg',
-                'title'  =&gt; __('WordPress.org'),
-                'href'   =&gt; __('http://wordpress.org'),
</del><ins>+                'parent'    =&gt; 'wp-logo',
+                'secondary' =&gt; true,
+                'id'        =&gt; 'wporg',
+                'title'     =&gt; __('WordPress.org'),
+                'href'      =&gt; __('http://wordpress.org'),
</ins><span class="cx">         ) );
</span><span class="cx"> 
</span><span class="cx">         // Add codex link
</span><span class="cx">         $wp_admin_bar-&gt;add_menu( array(
</span><del>-                'parent' =&gt; 'wp-logo-secondary',
-                'id'     =&gt; 'documentation',
-                'title'  =&gt; __('Documentation'),
-                'href'   =&gt; __('http://codex.wordpress.org'),
</del><ins>+                'parent'    =&gt; 'wp-logo',
+                'secondary' =&gt; true,
+                'id'        =&gt; 'documentation',
+                'title'     =&gt; __('Documentation'),
+                'href'      =&gt; __('http://codex.wordpress.org'),
</ins><span class="cx">         ) );
</span><span class="cx"> 
</span><span class="cx">         // Add forums link
</span><span class="cx">         $wp_admin_bar-&gt;add_menu( array(
</span><del>-                'parent' =&gt; 'wp-logo-secondary',
-                'id'     =&gt; 'support-forums',
-                'title'  =&gt; __('Support Forums'),
-                'href'   =&gt; __('http://wordpress.org/support/'),
</del><ins>+                'parent'    =&gt; 'wp-logo',
+                'secondary' =&gt; true,
+                'id'        =&gt; 'support-forums',
+                'title'     =&gt; __('Support Forums'),
+                'href'      =&gt; __('http://wordpress.org/support/'),
</ins><span class="cx">         ) );
</span><span class="cx"> 
</span><span class="cx">         // Add feedback link
</span><span class="cx">         $wp_admin_bar-&gt;add_menu( array(
</span><del>-                'parent' =&gt; 'wp-logo-secondary',
-                'id'     =&gt; 'feedback',
-                'title'  =&gt; __('Feedback'),
-                'href'   =&gt; __('http://wordpress.org/support/forum/requests-and-feedback'),
</del><ins>+                'parent'    =&gt; 'wp-logo',
+                'secondary' =&gt; true,
+                'id'        =&gt; 'feedback',
+                'title'     =&gt; __('Feedback'),
+                'href'      =&gt; __('http://wordpress.org/support/forum/requests-and-feedback'),
</ins><span class="cx">         ) );
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -150,17 +144,15 @@
</span><span class="cx">                 /* Add the 'My Account' menu */
</span><span class="cx">                 $avatar = get_avatar( $user_id, 28 );
</span><span class="cx">                 $howdy  = sprintf( __('Howdy, %1$s'), $user_identity );
</span><del>-                $class  = 'opposite';
</del><ins>+                $class  = empty( $avatar ) ? '' : 'with-avatar';
</ins><span class="cx"> 
</span><del>-                if ( ! empty( $avatar ) )
-                        $class .= ' with-avatar';
-
</del><span class="cx">                 $wp_admin_bar-&gt;add_menu( array(
</span><del>-                        'id'    =&gt; 'my-account',
-                        'title' =&gt; $howdy . $avatar,
-                        'href'  =&gt; $profile_url,
-                        'meta'  =&gt; array(
-                                'class' =&gt; $class,
</del><ins>+                        'id'        =&gt; 'my-account',
+                        'secondary' =&gt; true,
+                        'title'     =&gt; $howdy . $avatar,
+                        'href'      =&gt; $profile_url,
+                        'meta'      =&gt; array(
+                                'class'     =&gt; $class,
</ins><span class="cx">                         ),
</span><span class="cx">                 ) );
</span><span class="cx"> 
</span><span class="lines">@@ -322,17 +314,6 @@
</span><span class="cx">                 ) );
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if ( $wp_admin_bar-&gt;user-&gt;blogs ) {
-                $wp_admin_bar-&gt;add_menu( array(
-                        'parent' =&gt; 'my-sites',
-                        'id'     =&gt; 'my-sites-secondary',
-                        'title'  =&gt; '&amp;nbsp;',
-                        'meta'   =&gt; array(
-                                'class' =&gt; 'secondary',
-                        ),
-                ) );
-        }
-
</del><span class="cx">         // Add blog links
</span><span class="cx">         $blue_wp_logo_url = includes_url('images/wpmini-blue.png');
</span><span class="cx"> 
</span><span class="lines">@@ -345,10 +326,11 @@
</span><span class="cx">                 $menu_id  = 'blog-' . $blog-&gt;userblog_id;
</span><span class="cx"> 
</span><span class="cx">                 $wp_admin_bar-&gt;add_menu( array(
</span><del>-                        'parent' =&gt; 'my-sites-secondary',
-                        'id'     =&gt; $menu_id,
-                        'title'  =&gt; $blavatar . $blogname,
-                        'href'   =&gt; get_admin_url( $blog-&gt;userblog_id ),
</del><ins>+                        'parent'    =&gt; 'my-sites',
+                        'secondary' =&gt; true,
+                        'id'        =&gt; $menu_id,
+                        'title'     =&gt; $blavatar . $blogname,
+                        'href'      =&gt; get_admin_url( $blog-&gt;userblog_id ),
</ins><span class="cx">                 ) );
</span><span class="cx"> 
</span><span class="cx">                 $wp_admin_bar-&gt;add_menu( array(
</span><span class="lines">@@ -473,23 +455,23 @@
</span><span class="cx">  * @since 3.1.0
</span><span class="cx">  */
</span><span class="cx"> function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
</span><del>-        $primary = $secondary = array();
</del><ins>+        $actions = array();
</ins><span class="cx"> 
</span><span class="cx">         $cpts = (array) get_post_types( array( 'show_in_admin_bar' =&gt; true ), 'objects' );
</span><span class="cx"> 
</span><span class="cx">         if ( isset( $cpts['post'] ) &amp;&amp; current_user_can( $cpts['post']-&gt;cap-&gt;edit_posts ) ) {
</span><del>-                $primary[ 'post-new.php' ] = array( $cpts['post']-&gt;labels-&gt;name_admin_bar, 'new-post' );
</del><ins>+                $actions[ 'post-new.php' ] = array( $cpts['post']-&gt;labels-&gt;name_admin_bar, 'new-post' );
</ins><span class="cx">                 unset( $cpts['post'] );
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if ( current_user_can( 'upload_files' ) )
</span><del>-                $primary[ 'media-new.php' ] = array( _x( 'Media', 'add new from admin bar' ), 'new-media' );
</del><ins>+                $actions[ 'media-new.php' ] = array( _x( 'Media', 'add new from admin bar' ), 'new-media' );
</ins><span class="cx"> 
</span><span class="cx">         if ( current_user_can( 'manage_links' ) )
</span><del>-                $primary[ 'link-add.php' ] = array( _x( 'Link', 'add new from admin bar' ), 'new-link' );
</del><ins>+                $actions[ 'link-add.php' ] = array( _x( 'Link', 'add new from admin bar' ), 'new-link' );
</ins><span class="cx"> 
</span><span class="cx">         if ( isset( $cpts['page'] ) &amp;&amp; current_user_can( $cpts['page']-&gt;cap-&gt;edit_posts ) ) {
</span><del>-                $primary[ 'post-new.php?post_type=page' ] = array( $cpts['page']-&gt;labels-&gt;name_admin_bar, 'new-page' );
</del><ins>+                $actions[ 'post-new.php?post_type=page' ] = array( $cpts['page']-&gt;labels-&gt;name_admin_bar, 'new-page' );
</ins><span class="cx">                 unset( $cpts['page'] );
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -499,47 +481,32 @@
</span><span class="cx">                         continue;
</span><span class="cx"> 
</span><span class="cx">                 $key = 'post-new.php?post_type=' . $cpt-&gt;name;
</span><del>-                $primary[ $key ] = array( $cpt-&gt;labels-&gt;name_admin_bar, 'new-' . $cpt-&gt;name );
</del><ins>+                $actions[ $key ] = array( $cpt-&gt;labels-&gt;name_admin_bar, 'new-' . $cpt-&gt;name );
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if ( current_user_can( 'create_users' ) || current_user_can( 'promote_users' ) )
</span><del>-                $secondary[ 'user-new.php' ] = array( _x( 'User', 'add new from admin bar' ), 'new-user' );
</del><ins>+                $actions[ 'user-new.php' ] = array( _x( 'User', 'add new from admin bar' ), 'new-user', true );
</ins><span class="cx"> 
</span><del>-        if ( ! $primary &amp;&amp; ! $secondary )
</del><ins>+        if ( ! $actions )
</ins><span class="cx">                 return;
</span><span class="cx"> 
</span><span class="cx">         $wp_admin_bar-&gt;add_menu( array(
</span><span class="cx">                 'id'    =&gt; 'new-content',
</span><span class="cx">                 'title' =&gt; _x( 'Add New', 'admin bar menu group label' ),
</span><del>-                'href'  =&gt; admin_url( current( array_keys( $primary ) ) ),
</del><ins>+                'href'  =&gt; admin_url( current( array_keys( $actions ) ) ),
</ins><span class="cx">         ) );
</span><span class="cx"> 
</span><del>-        $items = array(
-                'new-content' =&gt; $primary,
-                'new-content-secondary' =&gt; $secondary,
-        );
</del><ins>+        foreach ( $actions as $link =&gt; $action ) {
+                list( $title, $id ) = $action;
+                $secondary = ! empty( $action[2] );
</ins><span class="cx"> 
</span><del>-        foreach ( $items as $parent =&gt; $actions ) {
-
-                if ( ! empty( $actions ) &amp;&amp; $parent == 'new-content-secondary' ) {
-                        $wp_admin_bar-&gt;add_menu( array(
-                                'parent' =&gt; 'new-content',
-                                'id'     =&gt; 'new-content-secondary',
-                                'title'  =&gt; '&amp;nbsp;',
-                                'meta'   =&gt; array(
-                                        'class' =&gt; 'secondary',
-                                ),
-                        ) );
-                }
-
-                foreach ( $actions as $link =&gt; $action ) {
-                        $wp_admin_bar-&gt;add_menu( array(
-                                'parent' =&gt; $parent,
-                                'id'     =&gt; $action[1],
-                                'title'  =&gt; $action[0],
-                                'href'   =&gt; admin_url( $link )
-                        ) );
-                }
</del><ins>+                $wp_admin_bar-&gt;add_menu( array(
+                        'parent'    =&gt; 'new-content',
+                        'secondary' =&gt; $secondary,
+                        'id'        =&gt; $id,
+                        'title'     =&gt; $title,
+                        'href'      =&gt; admin_url( $link )
+                ) );
</ins><span class="cx">         }
</span><span class="cx"> }
</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 (19229 => 19230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-admin-bar.php        2011-11-09 16:46:05 UTC (rev 19229)
+++ trunk/wp-includes/class-wp-admin-bar.php        2011-11-09 19:12:48 UTC (rev 19230)
</span><span class="lines">@@ -12,6 +12,11 @@
</span><span class="cx">                         $this-&gt;proto = 'https://';
</span><span class="cx"> 
</span><span class="cx">                 $this-&gt;user = new stdClass;
</span><ins>+                $this-&gt;root = new stdClass;
+                $this-&gt;root-&gt;children  = (object) array(
+                        'primary'   =&gt; array(),
+                        'secondary' =&gt; array(),
+                );
</ins><span class="cx"> 
</span><span class="cx">                 if ( is_user_logged_in() ) {
</span><span class="cx">                         /* Populate settings we need for the menu based on the current user. */
</span><span class="lines">@@ -59,11 +64,12 @@
</span><span class="cx">          * Add a node to the menu.
</span><span class="cx">          *
</span><span class="cx">          * @param array $args - The arguments for each node.
</span><del>-         * - id       - string - The ID of the item.
-         * - title    - string - The title of the node.
-         * - parent   - string - The ID of the parent node. Optional.
-         * - href     - string - The link for the item. Optional.
-         * - meta     - array  - Meta data including the following keys: html, class, onclick, target, title.
</del><ins>+         * - id         - string    - The ID of the item.
+         * - title      - string    - The title of the node.
+         * - parent     - string    - The ID of the parent node. Optional.
+         * - href       - string    - The link for the item. Optional.
+         * - secondary  - boolean   - If the item should be part of a secondary menu. Optional. Default false.
+         * - meta       - array     - Meta data including the following keys: html, class, onclick, target, title.
</ins><span class="cx">          */
</span><span class="cx">         public function add_node( $args ) {
</span><span class="cx">                 // Shim for old method signature: add_node( $parent_id, $menu_obj, $args )
</span><span class="lines">@@ -80,11 +86,12 @@
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 $defaults = array(
</span><del>-                        'id'       =&gt; false,
-                        'title'    =&gt; false,
-                        'parent'   =&gt; false,
-                        'href'     =&gt; false,
-                        'meta'     =&gt; array(),
</del><ins>+                        'id'        =&gt; false,
+                        'title'     =&gt; false,
+                        'parent'    =&gt; false,
+                        'href'      =&gt; false,
+                        'secondary' =&gt; false,
+                        'meta'      =&gt; array(),
</ins><span class="cx">                 );
</span><span class="cx"> 
</span><span class="cx">                 // If the node already exists, keep any data that isn't provided.
</span><span class="lines">@@ -92,6 +99,10 @@
</span><span class="cx">                         $defaults = (array) $this-&gt;nodes[ $args['id'] ];
</span><span class="cx"> 
</span><span class="cx">                 $args = wp_parse_args( $args, $defaults );
</span><ins>+                $args['children'] = (object) array(
+                        'primary'   =&gt; array(),
+                        'secondary' =&gt; array(),
+                );
</ins><span class="cx"> 
</span><span class="cx">                 $this-&gt;nodes[ $args['id'] ] = (object) $args;
</span><span class="cx">         }
</span><span class="lines">@@ -106,19 +117,20 @@
</span><span class="cx"> 
</span><span class="cx">                         // Handle root menu items
</span><span class="cx">                         if ( empty( $node-&gt;parent ) ) {
</span><del>-                                $this-&gt;root[] = $node;
-                                continue;
-                        }
</del><ins>+                                $parent = $this-&gt;root;
</ins><span class="cx"> 
</span><span class="cx">                         // If the parent node isn't registered, ignore the node.
</span><del>-                        if ( ! isset( $this-&gt;nodes[ $node-&gt;parent ] ) )
</del><ins>+                        } elseif ( ! isset( $this-&gt;nodes[ $node-&gt;parent ] ) ) {
</ins><span class="cx">                                 continue;
</span><span class="cx"> 
</span><del>-                        $parent = $this-&gt;nodes[ $node-&gt;parent ];
-                        if ( ! isset( $parent-&gt;children ) )
-                                $parent-&gt;children = array();
</del><ins>+                        } else {
+                                $parent = $this-&gt;nodes[ $node-&gt;parent ];
+                        }
</ins><span class="cx"> 
</span><del>-                        $parent-&gt;children[] = $node;
</del><ins>+                        if ( $node-&gt;secondary )
+                                $parent-&gt;children-&gt;secondary[] = $node;
+                        else
+                                $parent-&gt;children-&gt;primary[] = $node;
</ins><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 ?&gt;
</span><span class="lines">@@ -126,10 +138,19 @@
</span><span class="cx">                         &lt;div class=&quot;quicklinks&quot;&gt;
</span><span class="cx">                                 &lt;ul class=&quot;ab-top-menu&quot;&gt;&lt;?php
</span><span class="cx"> 
</span><del>-                                        foreach ( $this-&gt;root as $node ) {
</del><ins>+                                        foreach ( $this-&gt;root-&gt;children-&gt;primary as $node ) {
</ins><span class="cx">                                                 $this-&gt;recursive_render( $node );
</span><span class="cx">                                         }
</span><span class="cx"> 
</span><ins>+                                        if ( ! empty( $this-&gt;root-&gt;children-&gt;secondary ) ):
+                                                ?&gt;&lt;ul class=&quot;top-secondary&quot;&gt;&lt;?php
+
+                                                        foreach ( $this-&gt;root-&gt;children-&gt;secondary as $node ) {
+                                                                $this-&gt;recursive_render( $node );
+                                                        }
+
+                                                ?&gt;&lt;/ul&gt;&lt;?php
+                                        endif;
</ins><span class="cx">                                 ?&gt;&lt;/ul&gt;
</span><span class="cx">                         &lt;/div&gt;
</span><span class="cx">                 &lt;/div&gt;
</span><span class="lines">@@ -138,7 +159,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         function recursive_render( $node ) {
</span><del>-                $is_parent = ! empty( $node-&gt;children );
</del><ins>+                $is_parent = ! empty( $node-&gt;children-&gt;primary );
</ins><span class="cx"> 
</span><span class="cx">                 $menuclass = $is_parent ? 'menupop' : '';
</span><span class="cx">                 if ( ! empty( $node-&gt;meta['class'] ) )
</span><span class="lines">@@ -173,16 +194,22 @@
</span><span class="cx"> 
</span><span class="cx">                         ?&gt;&lt;/a&gt;
</span><span class="cx"> 
</span><del>-                        &lt;?php if ( $is_parent ) : ?&gt;
-                                &lt;ul&gt;&lt;?php
-
-                                // Render children.
-                                foreach ( $node-&gt;children as $child_node ) {
</del><ins>+                        &lt;?php
+                        if ( $is_parent ) :
+                                ?&gt;&lt;ul&gt;&lt;?php
+                                foreach ( $node-&gt;children-&gt;primary as $child_node ) {
</ins><span class="cx">                                         $this-&gt;recursive_render( $child_node );
</span><span class="cx">                                 }
</span><span class="cx"> 
</span><del>-                                ?&gt;&lt;/ul&gt;
-                        &lt;?php endif;
</del><ins>+                                if ( ! empty( $node-&gt;children-&gt;secondary ) ):
+                                        ?&gt;&lt;ul class=&quot;sub-secondary&quot;&gt;&lt;?php
+                                        foreach ( $node-&gt;children-&gt;secondary as $child_node ) {
+                                                $this-&gt;recursive_render( $child_node );
+                                        }
+                                        ?&gt;&lt;/ul&gt;&lt;?php
+                                endif;
+                                ?&gt;&lt;/ul&gt;&lt;?php
+                        endif;
</ins><span class="cx"> 
</span><span class="cx">                         if ( ! empty( $node-&gt;meta['html'] ) )
</span><span class="cx">                                 echo $node-&gt;meta['html'];
</span></span></pre></div>
<a id="trunkwpincludescssadminbarcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/admin-bar.css (19229 => 19230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/admin-bar.css        2011-11-09 16:46:05 UTC (rev 19229)
+++ trunk/wp-includes/css/admin-bar.css        2011-11-09 19:12:48 UTC (rev 19230)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#wpadminbar *{height:auto;width:auto;margin:0;padding:0;position:static;text-transform:none;letter-spacing:normal;line-height:1;font:normal 13px/28px sans-serif;color:#ccc;text-shadow:#444 0 -1px 0;}#wpadminbar ul li:before,#wpadminbar ul li:after{content:normal;}#wpadminbar a,#wpadminbar a:hover,#wpadminbar a img,#wpadminbar a img:hover{outline:none;border:none;text-decoration:none;background:none;}#wpadminbar{direction:ltr;color:#ccc;font:normal 13px/28px sans-serif;height:28px;position:fixed;top:0;left:0;width:100%;z-index:99999;min-width:960px;background-color:#464646;background-image:-ms-linear-gradient(bottom,#373737,#464646 5px);background-image:-moz-linear-gradient(bottom,#373737,#464646 5px);background-image:-o-linear-gradient(bottom,#373737,#464646 5px);background-image:-webkit-gradient(linear,left bottom,left top,from(#373737),to(#464646));background-image:-webkit-linear-gradient(bottom,#373737,#464646 5px);background-image:linear-gradient(bottom,#3737
 37,#464646 5px);}#wpadminbar ul,#wpadminbar ul li{background:none;list-style:none;margin:0;padding:0;position:relative;z-index:99999;}#wpadminbar .quicklinks{border-left:1px solid transparent;}#wpadminbar .quicklinks ul{text-align:left;}#wpadminbar li{float:left;}#wpadminbar .quicklinks&gt;ul&gt;li{border-right:1px solid #555;}#wpadminbar .quicklinks&gt;ul&gt;li&gt;a{border-right:1px solid #333;}#wpadminbar .quicklinks&gt;ul&gt;li.opposite{border-left:1px solid #333;border-right:0;}#wpadminbar .quicklinks&gt;ul&gt;li.opposite&gt;a{border-left:1px solid #555;border-right:0;}#wpadminbar .quicklinks a,#wpadminbar .shortlink-input{height:28px;display:block;padding:0 1em;margin:0;}#wpadminbar .quicklinks a&gt;span{line-height:28px;}#wpadminbar .quicklinks .menupop ul,#wpadminbar .shortlink-input{margin:0 0 0 -1px;padding-top:6px;padding-bottom:6px;-moz-box-shadow:0 4px 6px rgba(0,0,0,0.2);-webkit-box-shadow:0 4px 6px rgba(0,0,0,0.2);box-shadow:0 4px 6px rgba(0,0,0,0.2);background
 :#fff;display:none;position:absolute;float:none;border-width:0 1px 1px 1px;border-style:solid;border-color:#dfdfdf;}#wpadminbar .quicklinks .opposite.menupop ul{right:0;margin:0 -1px 0 0;}#wpadminbar .selected .shortlink-input{display:block;}#wpadminbar .quicklinks .menupop ul li{float:none;}#wpadminbar .quicklinks .menupop ul li a strong{font-weight:bold;}#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop ul li a span,#wpadminbar .quicklinks .menupop ul li a strong,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar .quicklinks .menupop.hover ul li a span,#wpadminbar.nojs .quicklinks .menupop:hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a span,#wpadminbar .shortlink-input{line-height:26px;height:26px;color:#21759B;text-shadow:none;white-space:nowrap;min-width:140px;}#wpadminbar .shortlink-input{width:200px;}#wpadminbar.nojs .quicklinks li:hover&gt;ul,#wpadminbar .quicklinks li.hover&gt;ul{display:block;}#wpadminbar .quicklink
 s .menupop li:hover&gt;ul,#wpadminbar .quicklinks .menupop li.hover&gt;ul{margin-left:100%;margin-top:-33px;border-width:1px;}#wpadminbar .quicklinks .opposite.menupop li:hover&gt;ul,#wpadminbar .quicklinks .opposite.menupop li.hover&gt;ul{margin-left:0;left:inherit;right:100%;}#wpadminbar .ab-top-menu&gt;li:hover,#wpadminbar .ab-top-menu&gt;li&gt;a:focus{background:#3a3a3a;background-image:-ms-linear-gradient(bottom,#3a3a3a,#222);background-image:-moz-linear-gradient(bottom,#3a3a3a,#222);background-image:-o-linear-gradient(bottom,#3a3a3a,#222);background-image:-webkit-gradient(linear,left bottom,left top,from(#3a3a3a),to(#222));background-image:-webkit-linear-gradient(bottom,#3a3a3a,#222);background-image:linear-gradient(bottom,#3a3a3a,#222);}#wpadminbar.nojs .ab-top-menu&gt;li.menupop:hover,#wpadminbar .ab-top-menu li.menupop.hover,#wpadminbar .quicklinks .menupop&gt;a:focus{background:#fff;}#wpadminbar.nojs .quicklinks .menupop:hover a,#wpadminbar.nojs .quicklinks .menupo
 p:hover span,#wpadminbar .quicklinks .menupop.hover a,#wpadminbar .quicklinks .menupop.hover span,#wpadminbar .quicklinks .menupop a:focus,#wpadminbar .quicklinks .menupop a:focus span{color:#333;text-shadow:none;}#wpadminbar .quicklinks .menupop li:hover,#wpadminbar .quicklinks .menupop li.hover,#wpadminbar .quicklinks .menupop a:focus{background-color:#eaf2fa;}#wpadminbar .quicklinks .menupop&gt;a:focus{background-color:#fff;}#wpadminbar .ab-top-menu&gt;.menupop&gt;a span{white-space:nowrap;}#wpadminbar .ab-top-menu&gt;li&gt;a:hover,#wpadminbar .ab-top-menu&gt;li&gt;a:hover span,#wpadminbar .ab-top-menu&gt;li&gt;a:focus,#wpadminbar .ab-top-menu&gt;li&gt;a:focus span{color:#fafafa;}#wpadminbar.nojs .ab-top-menu&gt;li&gt;a:hover span,#wpadminbar .ab-top-menu&gt;li.hover&gt;a:hover span{background:none;}#wpadminbar .menupop li a&gt;span{display:block;background:url(../images/admin-bar-sprite.png?d=11122010) right -31px no-repeat;padding:0 1.5em 0 0;}#wpadminbar .opposite.menu
 pop li a&gt;span{background-position:-28px -31px;padding:0 0 0 1.5em;}#wpadminbar .quicklinks .menupop .secondary{background:#eee;margin:6px 0 -6px;border-top:1px solid #dfdfdf;}#wpadminbar .quicklinks .menupop .secondary&gt;a{display:none;}#wpadminbar .quicklinks .menupop li.secondary&gt;ul,#wpadminbar .quicklinks .opposite.menupop li.secondary&gt;ul{display:block;position:relative;right:auto;margin:0;border:0;background:#eee;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;}#wpadminbar .quicklinks .menupop li.secondary&gt;ul&gt;li:hover,#wpadminbar .quicklinks .menupop li.secondary&gt;ul&gt;li.hover,#wpadminbar .quicklinks .menupop li.secondary&gt;ul&gt;li a:focus{background:#dfdfdf;}#wpadminbar .quicklinks a span#ab-updates{background:#eee;color:#333;text-shadow:none;display:inline;padding:2px 5px;font-size:10px;font-weight:bold;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar .quicklinks a:hover span#ab-updates{background:#fff;color:#000;}#wpadminba
 r li.opposite{float:right;}#wpadminbar ul li:last-child,#wpadminbar ul li:last-child a{border-right:0;}#wp-admin-bar-my-account&gt;ul{min-width:270px;}#wpadminbar #wp-admin-bar-my-account .user-info-item{margin-left:88px;margin-right:16px;}#wpadminbar #wp-admin-bar-my-account .user-info-item&gt;a{padding-left:8px;}#wpadminbar #wp-admin-bar-my-account .user-info{margin-top:6px;margin-bottom:15px;height:auto;background:none;}#wp-admin-bar-my-account .user-info .avatar{position:absolute;left:-72px;top:4px;}#wpadminbar #wp-admin-bar-my-account .user-info a{height:auto;}#wpadminbar #wp-admin-bar-my-account .user-info span{background:none;padding:0;height:18px;}#wpadminbar #wp-admin-bar-my-account .user-info .display-name{color:#333;}#wpadminbar #wp-admin-bar-my-account .user-info .username{color:#999;font-size:11px;}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar&gt;a img{width:16px;height:16px;border:1px solid #999;padding:0;background:#eee;line-height:24px;vertic
 al-align:middle;margin:-2px 0 0 6px;float:none;}#wpadminbar .quicklinks li img.blavatar{vertical-align:middle;margin:-3px 4px 0 0;padding:0;}#wpadminbar #wp-admin-bar-search a{padding:0;}#wpadminbar .quicklinks .admin-bar-search:hover{background:transparent;}#wpadminbar #adminbarsearch{float:right;height:24px;padding:2px 4px;margin:0;}#wpadminbar #adminbarsearch .adminbar-input{height:23px;width:140px;float:left;font:13px sans-serif;border:none;padding:0 3px 0 24px;margin:0 3px 0 0;color:#ccc;text-shadow:#444 0 -1px 0;background-color:rgba(255,255,255,0);background-image:url('../images/admin-bar-search.png');background-repeat:no-repeat;background-position:4px 2px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;outline:none;-webkit-transition-duration:400ms;-webkit-transition-property:width,background;-webkit-transit
 ion-timing-function:ease;-moz-transition-duration:400ms;-moz-transition-property:width,background;-moz-transition-timing-function:ease;-o-transition-duration:400ms;-o-transition-property:width,background;-o-transition-timing-function:ease;}#wpadminbar #adminbarsearch .adminbar-input:focus{color:#555;text-shadow:0 1px 0 #fff;width:200px;background-color:rgba(255,255,255,0.9);}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-button{display:none;}#wpadminbar .wp-admin-bar-logo&gt;a{padding-left:24px;background:url(../images/wp-logo-white.png) no-repeat 13px 6px;}#wpadminbar .wp-admin-bar-logo&gt;a span{height:28px;}#wpadminbar.nojs .wp-admin-bar-logo:hover&gt;a,#wpadminbar .wp-admin-bar-logo.hover&gt;a,#wpadminbar .quicklinks .wp-admin-bar-logo&gt;a:focus{background:url(../images/wp-logo-dark.png) no-repeat 12px 6px;}#wpadminbar .ab-co
 mments-icon{position:relative;padding-top:5px;float:left;}#wpadminbar .ab-comments-icon-body{margin-top:3px;background:#999;height:10px;width:14px;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar a:hover .ab-comments-icon-body{background:#bbb;color:#555;}#wpadminbar a .ab-comments-icon-arrow{height:0;position:absolute;bottom:-3px;left:3px;border-left:4px solid #999;border-bottom:4px solid transparent;}#wpadminbar a:hover .ab-comments-icon-arrow{border-left-color:#bbb;}#wpadminbar #ab-awaiting-mod{margin-left:4px;}#wpadminbar span.count-0{display:none;}* html #wpadminbar{overflow:hidden;position:absolute;}* html #wpadminbar .quicklinks ul li a{float:left;}* html #wpadminbar .menupop a span{background-image:none;}
</del><span class="cx">\ No newline at end of file
</span><ins>+#wpadminbar *{height:auto;width:auto;margin:0;padding:0;position:static;text-transform:none;letter-spacing:normal;line-height:1;font:normal 13px/28px sans-serif;color:#ccc;text-shadow:#444 0 -1px 0;}#wpadminbar ul li:before,#wpadminbar ul li:after{content:normal;}#wpadminbar a,#wpadminbar a:hover,#wpadminbar a img,#wpadminbar a img:hover{outline:none;border:none;text-decoration:none;background:none;}#wpadminbar{direction:ltr;color:#ccc;font:normal 13px/28px sans-serif;height:28px;position:fixed;top:0;left:0;width:100%;z-index:99999;min-width:960px;background-color:#464646;background-image:-ms-linear-gradient(bottom,#373737,#464646 5px);background-image:-moz-linear-gradient(bottom,#373737,#464646 5px);background-image:-o-linear-gradient(bottom,#373737,#464646 5px);background-image:-webkit-gradient(linear,left bottom,left top,from(#373737),to(#464646));background-image:-webkit-linear-gradient(bottom,#373737,#464646 5px);background-image:linear-gradient(bottom,#3737
 37,#464646 5px);}#wpadminbar ul,#wpadminbar ul li{background:none;list-style:none;margin:0;padding:0;position:relative;z-index:99999;}#wpadminbar .quicklinks{border-left:1px solid transparent;}#wpadminbar .quicklinks ul{text-align:left;}#wpadminbar li{float:left;}#wpadminbar .quicklinks&gt;ul&gt;li{border-right:1px solid #555;}#wpadminbar .quicklinks&gt;ul&gt;li&gt;a{border-right:1px solid #333;}#wpadminbar .quicklinks .top-secondary&gt;li{border-left:1px solid #333;border-right:0;float:right;}#wpadminbar .quicklinks .top-secondary&gt;li&gt;a{border-left:1px solid #555;border-right:0;}#wpadminbar .quicklinks a,#wpadminbar .shortlink-input{height:28px;display:block;padding:0 1em;margin:0;}#wpadminbar .quicklinks a&gt;span{line-height:28px;}#wpadminbar .quicklinks .menupop ul,#wpadminbar .shortlink-input{margin:0 0 0 -1px;padding-top:6px;padding-bottom:6px;-moz-box-shadow:0 4px 6px rgba(0,0,0,0.2);-webkit-box-shadow:0 4px 6px rgba(0,0,0,0.2);box-shadow:0 4px 6px rgba(0,0,0,0.2
 );background:#fff;display:none;position:absolute;float:none;border-width:0 1px 1px 1px;border-style:solid;border-color:#dfdfdf;}#wpadminbar .quicklinks .top-secondary .menupop ul{right:0;margin:0 -1px 0 0;}#wpadminbar .selected .shortlink-input{display:block;}#wpadminbar .quicklinks .menupop ul li{float:none;}#wpadminbar .quicklinks .menupop ul li a strong{font-weight:bold;}#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop ul li a span,#wpadminbar .quicklinks .menupop ul li a strong,#wpadminbar .quicklinks .menupop.hover ul li a,#wpadminbar .quicklinks .menupop.hover ul li a span,#wpadminbar.nojs .quicklinks .menupop:hover ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a span,#wpadminbar .shortlink-input{line-height:26px;height:26px;color:#21759B;text-shadow:none;white-space:nowrap;min-width:140px;}#wpadminbar .shortlink-input{width:200px;}#wpadminbar.nojs .quicklinks li:hover&gt;ul,#wpadminbar .quicklinks li.hover&gt;ul{display:block;}#wpa
 dminbar .quicklinks .menupop li:hover&gt;ul,#wpadminbar .quicklinks .menupop li.hover&gt;ul{margin-left:100%;margin-top:-33px;border-width:1px;}#wpadminbar .quicklinks .top-secondary .menupop li:hover&gt;ul,#wpadminbar .quicklinks .top-secondary .menupop li.hover&gt;ul{margin-left:0;left:inherit;right:100%;}#wpadminbar .ab-top-menu&gt;li:hover,#wpadminbar .ab-top-menu&gt;li&gt;a:focus{background:#3a3a3a;background-image:-ms-linear-gradient(bottom,#3a3a3a,#222);background-image:-moz-linear-gradient(bottom,#3a3a3a,#222);background-image:-o-linear-gradient(bottom,#3a3a3a,#222);background-image:-webkit-gradient(linear,left bottom,left top,from(#3a3a3a),to(#222));background-image:-webkit-linear-gradient(bottom,#3a3a3a,#222);background-image:linear-gradient(bottom,#3a3a3a,#222);}#wpadminbar.nojs .ab-top-menu&gt;li.menupop:hover,#wpadminbar .ab-top-menu li.menupop.hover,#wpadminbar .quicklinks .menupop&gt;a:focus{background:#fff;}#wpadminbar.nojs .quicklinks .menupop:hover a,#wpadm
 inbar.nojs .quicklinks .menupop:hover span,#wpadminbar .quicklinks .menupop.hover a,#wpadminbar .quicklinks .menupop.hover span,#wpadminbar .quicklinks .menupop a:focus,#wpadminbar .quicklinks .menupop a:focus span{color:#333;text-shadow:none;}#wpadminbar .quicklinks .menupop li:hover,#wpadminbar .quicklinks .menupop li.hover,#wpadminbar .quicklinks .menupop a:focus{background-color:#eaf2fa;}#wpadminbar .quicklinks .menupop&gt;a:focus{background-color:#fff;}#wpadminbar .ab-top-menu&gt;.menupop&gt;a span{white-space:nowrap;}#wpadminbar .ab-top-menu&gt;li&gt;a:hover,#wpadminbar .ab-top-menu&gt;li&gt;a:hover span,#wpadminbar .ab-top-menu&gt;li&gt;a:focus,#wpadminbar .ab-top-menu&gt;li&gt;a:focus span{color:#fafafa;}#wpadminbar.nojs .ab-top-menu&gt;li&gt;a:hover span,#wpadminbar .ab-top-menu&gt;li.hover&gt;a:hover span{background:none;}#wpadminbar .menupop li a&gt;span{display:block;background:url(../images/admin-bar-sprite.png?d=11122010) right -31px no-repeat;padding:0 1.5em 0
  0;}#wpadminbar .top-secondary .menupop li a&gt;span{background-position:-28px -31px;padding:0 0 0 1.5em;}#wpadminbar .quicklinks .menupop ul.sub-secondary{display:block;position:relative;right:auto;margin:0;border:0;background:#eee;margin:6px 0 -6px;border-top:1px solid #dfdfdf;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;}#wpadminbar .quicklinks .menupop .sub-secondary&gt;li:hover,#wpadminbar .quicklinks .menupop .sub-secondary&gt;li.hover,#wpadminbar .quicklinks .menupop .sub-secondary&gt;li a:focus{background:#dfdfdf;}#wpadminbar .quicklinks a span#ab-updates{background:#eee;color:#333;text-shadow:none;display:inline;padding:2px 5px;font-size:10px;font-weight:bold;-webkit-border-radius:10px;border-radius:10px;}#wpadminbar .quicklinks a:hover span#ab-updates{background:#fff;color:#000;}#wpadminbar .top-secondary{float:right;}#wpadminbar ul li:last-child,#wpadminbar ul li:last-child a{border-right:0;}#wp-admin-bar-my-account&gt;ul{min-width:270px;}#wpadminb
 ar #wp-admin-bar-my-account .user-info-item{margin-left:88px;margin-right:16px;}#wpadminbar #wp-admin-bar-my-account .user-info-item&gt;a{padding-left:8px;}#wpadminbar #wp-admin-bar-my-account .user-info{margin-top:6px;margin-bottom:15px;height:auto;background:none;}#wp-admin-bar-my-account .user-info .avatar{position:absolute;left:-72px;top:4px;}#wpadminbar #wp-admin-bar-my-account .user-info a{height:auto;}#wpadminbar #wp-admin-bar-my-account .user-info span{background:none;padding:0;height:18px;}#wpadminbar #wp-admin-bar-my-account .user-info .display-name{color:#333;}#wpadminbar #wp-admin-bar-my-account .user-info .username{color:#999;font-size:11px;}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar&gt;a img{width:16px;height:16px;border:1px solid #999;padding:0;background:#eee;line-height:24px;vertical-align:middle;margin:-2px 0 0 6px;float:none;}#wpadminbar .quicklinks li img.blavatar{vertical-align:middle;margin:-3px 4px 0 0;padding:0;}#wpadminbar #wp-adm
 in-bar-search a{padding:0;}#wpadminbar .quicklinks .admin-bar-search:hover{background:transparent;}#wpadminbar #adminbarsearch{float:right;height:24px;padding:2px 4px;margin:0;}#wpadminbar #adminbarsearch .adminbar-input{height:23px;width:140px;float:left;font:13px sans-serif;border:none;padding:0 3px 0 24px;margin:0 3px 0 0;color:#ccc;text-shadow:#444 0 -1px 0;background-color:rgba(255,255,255,0);background-image:url('../images/admin-bar-search.png');background-repeat:no-repeat;background-position:4px 2px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;outline:none;-webkit-transition-duration:400ms;-webkit-transition-property:width,background;-webkit-transition-timing-function:ease;-moz-transition-duration:400ms;-moz-transition-property:width,background;-moz-transition-timing-function:ease;-o-transition-duration:40
 0ms;-o-transition-property:width,background;-o-transition-timing-function:ease;}#wpadminbar #adminbarsearch .adminbar-input:focus{color:#555;text-shadow:0 1px 0 #fff;width:200px;background-color:rgba(255,255,255,0.9);}#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder{color:#ddd;}#wpadminbar #adminbarsearch .adminbar-button{display:none;}#wpadminbar .wp-admin-bar-logo&gt;a{padding-left:24px;background:url(../images/wp-logo-white.png) no-repeat 13px 6px;}#wpadminbar .wp-admin-bar-logo&gt;a span{height:28px;}#wpadminbar.nojs .wp-admin-bar-logo:hover&gt;a,#wpadminbar .wp-admin-bar-logo.hover&gt;a,#wpadminbar .quicklinks .wp-admin-bar-logo&gt;a:focus{background:url(../images/wp-logo-dark.png) no-repeat 12px 6px;}#wpadminbar .ab-comments-icon{position:relative;padding-top:5px;float:left;}#wpadminbar .ab-comments-icon-body{margin-top:3px;background:#999;height:10px;width:14px;-webkit-borde
 r-radius:10px;border-radius:10px;}#wpadminbar a:hover .ab-comments-icon-body{background:#bbb;color:#555;}#wpadminbar a .ab-comments-icon-arrow{height:0;position:absolute;bottom:-3px;left:3px;border-left:4px solid #999;border-bottom:4px solid transparent;}#wpadminbar a:hover .ab-comments-icon-arrow{border-left-color:#bbb;}#wpadminbar #ab-awaiting-mod{margin-left:4px;}#wpadminbar span.count-0{display:none;}* html #wpadminbar{overflow:hidden;position:absolute;}* html #wpadminbar .quicklinks ul li a{float:left;}* html #wpadminbar .menupop a span{background-image:none;}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludescssadminbardevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/admin-bar.dev.css (19229 => 19230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/admin-bar.dev.css        2011-11-09 16:46:05 UTC (rev 19229)
+++ trunk/wp-includes/css/admin-bar.dev.css        2011-11-09 19:12:48 UTC (rev 19230)
</span><span class="lines">@@ -78,12 +78,13 @@
</span><span class="cx">         border-right: 1px solid #333;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#wpadminbar .quicklinks &gt; ul &gt; li.opposite {
</del><ins>+#wpadminbar .quicklinks .top-secondary &gt; li {
</ins><span class="cx">         border-left: 1px solid #333;
</span><span class="cx">         border-right: 0;
</span><ins>+        float: right;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-#wpadminbar .quicklinks &gt; ul &gt; li.opposite &gt; a {
</del><ins>+#wpadminbar .quicklinks .top-secondary &gt; li &gt; a {
</ins><span class="cx">         border-left: 1px solid #555;
</span><span class="cx">         border-right: 0;
</span><span class="cx"> }
</span><span class="lines">@@ -117,7 +118,7 @@
</span><span class="cx">         border-color: #dfdfdf;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#wpadminbar .quicklinks .opposite.menupop ul {
</del><ins>+#wpadminbar .quicklinks .top-secondary .menupop ul {
</ins><span class="cx">         right: 0;
</span><span class="cx">         margin: 0 -1px 0 0;
</span><span class="cx"> }
</span><span class="lines">@@ -166,8 +167,8 @@
</span><span class="cx">         border-width: 1px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#wpadminbar .quicklinks .opposite.menupop li:hover &gt; ul,
-#wpadminbar .quicklinks .opposite.menupop li.hover &gt; ul {
</del><ins>+#wpadminbar .quicklinks .top-secondary .menupop li:hover &gt; ul,
+#wpadminbar .quicklinks .top-secondary .menupop li.hover &gt; ul {
</ins><span class="cx">         margin-left: 0;
</span><span class="cx">         left: inherit;
</span><span class="cx">         right: 100%;
</span><span class="lines">@@ -232,37 +233,30 @@
</span><span class="cx">         padding: 0 1.5em 0 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#wpadminbar .opposite.menupop li a &gt; span {
</del><ins>+#wpadminbar .top-secondary .menupop li a &gt; span {
</ins><span class="cx">         background-position: -28px -31px;
</span><span class="cx">         padding: 0 0 0 1.5em;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#wpadminbar .quicklinks .menupop .secondary {
-        background: #eee;
-        margin: 6px 0 -6px;
-        border-top: 1px solid #dfdfdf;
-}
-
-#wpadminbar .quicklinks .menupop .secondary &gt; a {
-        display: none;
-}
-
-#wpadminbar .quicklinks .menupop li.secondary &gt; ul,
-#wpadminbar .quicklinks .opposite.menupop li.secondary &gt; ul {
</del><ins>+#wpadminbar .quicklinks .menupop ul.sub-secondary {
</ins><span class="cx">         display: block;
</span><span class="cx">         position: relative;
</span><span class="cx">         right: auto;
</span><span class="cx">         margin: 0;
</span><span class="cx">         border: 0;
</span><ins>+
</ins><span class="cx">         background: #eee;
</span><ins>+        margin: 6px 0 -6px;
+        border-top: 1px solid #dfdfdf;
+
</ins><span class="cx">         -moz-box-shadow: none;
</span><span class="cx">         -webkit-box-shadow: none;
</span><span class="cx">         box-shadow: none;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#wpadminbar .quicklinks .menupop li.secondary &gt; ul &gt; li:hover,
-#wpadminbar .quicklinks .menupop li.secondary &gt; ul &gt; li.hover,
-#wpadminbar .quicklinks .menupop li.secondary &gt; ul &gt; li a:focus {
</del><ins>+#wpadminbar .quicklinks .menupop .sub-secondary &gt; li:hover,
+#wpadminbar .quicklinks .menupop .sub-secondary &gt; li.hover,
+#wpadminbar .quicklinks .menupop .sub-secondary &gt; li a:focus {
</ins><span class="cx">         background: #dfdfdf;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -283,7 +277,7 @@
</span><span class="cx">         color: #000;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#wpadminbar li.opposite {
</del><ins>+#wpadminbar .top-secondary {
</ins><span class="cx">         float: right;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (19229 => 19230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php        2011-11-09 16:46:05 UTC (rev 19229)
+++ trunk/wp-includes/script-loader.php        2011-11-09 19:12:48 UTC (rev 19230)
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx">         $styles-&gt;add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' );
</span><span class="cx">         $styles-&gt;add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );
</span><span class="cx">         $styles-&gt;add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' );
</span><del>-        $styles-&gt;add( 'admin-bar', &quot;/wp-includes/css/admin-bar$suffix.css&quot;, array(), '20111108a' );
</del><ins>+        $styles-&gt;add( 'admin-bar', &quot;/wp-includes/css/admin-bar$suffix.css&quot;, array(), '20111109' );
</ins><span class="cx">         $styles-&gt;add( 'wp-jquery-ui-dialog', &quot;/wp-includes/css/jquery-ui-dialog$suffix.css&quot;, array(), '20111107' );
</span><span class="cx">         $styles-&gt;add( 'editor-buttons', &quot;/wp-includes/css/editor-buttons$suffix.css&quot;, array(), '20111107' );
</span><span class="cx">         $styles-&gt;add( 'wp-pointer', &quot;/wp-includes/css/wp-pointer$suffix.css&quot;, array(), '20111017' );
</span></span></pre>
</div>
</div>

</body>
</html>