<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16038] trunk/wp-includes: Admin bar cleanup.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16038">16038</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-10-28 08:31:36 +0000 (Thu, 28 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Admin bar cleanup. See <a href="http://trac.wordpress.org/ticket/14772">#14772</a> props filosofo.
Moves CSS into seperate files.
Patch cleanup included moving function call arguments back on to one line where not necessary to split them.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesadminbaradminbarclassphp">trunk/wp-includes/admin-bar/admin-bar-class.php</a></li>
<li><a href="#trunkwpincludesadminbaradminbardebugphp">trunk/wp-includes/admin-bar/admin-bar-debug.php</a></li>
<li><a href="#trunkwpincludesadminbaradminbarsuperadminphp">trunk/wp-includes/admin-bar/admin-bar-superadmin.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/wp-includes/css/</li>
<li><a href="#trunkwpincludescssadminbarrtlcss">trunk/wp-includes/css/admin-bar-rtl.css</a></li>
<li><a href="#trunkwpincludescssadminbarrtldevcss">trunk/wp-includes/css/admin-bar-rtl.dev.css</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="#trunkwpincludescsssuperadminbarcss">trunk/wp-includes/css/super-admin-bar.css</a></li>
<li><a href="#trunkwpincludescsssuperadminbardevcss">trunk/wp-includes/css/super-admin-bar.dev.css</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpincludesadminbaradminbarcssphp">trunk/wp-includes/admin-bar/admin-bar-css.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesadminbaradminbarclassphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar/admin-bar-class.php (16037 => 16038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar/admin-bar-class.php        2010-10-28 08:31:16 UTC (rev 16037)
+++ trunk/wp-includes/admin-bar/admin-bar-class.php        2010-10-28 08:31:36 UTC (rev 16038)
</span><span class="lines">@@ -1,20 +1,31 @@
</span><span class="cx"> &lt;?php
</span><span class="cx"> class WP_Admin_Bar {
</span><del>-        var $user;
</del><ins>+        var $changed_locale = false;
</ins><span class="cx">         var $menu;
</span><span class="cx">         var $need_to_change_locale = false;
</span><del>-        var $changed_locale = false;
</del><ins>+        var $proto = 'http://';
+        var $user;
</ins><span class="cx"> 
</span><del>-        function WP_Admin_Bar() {
-                global $current_user, $blog_id;
</del><ins>+        function initialize() {
+                global $blog_id;
</ins><span class="cx"> 
</span><ins>+                /* Only load super admin menu code if the logged in user is a super admin */
+                if ( is_super_admin() ) {
+                        require( ABSPATH . WPINC . '/admin-bar/admin-bar-debug.php' );
+                        require( ABSPATH . WPINC . '/admin-bar/admin-bar-superadmin.php' );
+                }
+                
+                /* Set the protocol used throughout this code */
+                if ( is_ssl() ) 
+                        $this-&gt;proto = 'https://';
+
</ins><span class="cx">                 $this-&gt;user = new stdClass;
</span><span class="cx">                 $this-&gt;menu = new stdClass;
</span><span class="cx"> 
</span><span class="cx">                 /* Populate settings we need for the menu based on the current user. */
</span><del>-                $this-&gt;user-&gt;blogs = get_blogs_of_user( $current_user-&gt;id );
</del><ins>+                $this-&gt;user-&gt;blogs = get_blogs_of_user( get_current_user_id() );
</ins><span class="cx">                 if ( is_multisite() ) {
</span><del>-                        $this-&gt;user-&gt;active_blog = get_active_blog_for_user( $current_user-&gt;id );
</del><ins>+                        $this-&gt;user-&gt;active_blog = get_active_blog_for_user( get_current_user_id() );
</ins><span class="cx">                         $this-&gt;user-&gt;domain = empty( $this-&gt;user-&gt;active_blog ) ? user_admin_url() : trailingslashit( get_home_url( $this-&gt;user-&gt;active_blog-&gt;blog_id ) );
</span><span class="cx">                         $this-&gt;user-&gt;account_domain = $this-&gt;user-&gt;domain;
</span><span class="cx">                 } else {
</span><span class="lines">@@ -23,6 +34,17 @@
</span><span class="cx">                         $this-&gt;user-&gt;account_domain = $this-&gt;user-&gt;domain;
</span><span class="cx">                 }
</span><span class="cx">                 $this-&gt;user-&gt;locale = get_locale();
</span><ins>+
+                add_action( 'wp_head', 'wp_admin_bar_header' );
+                add_action( 'admin_head', 'wp_admin_bar_header' );
+
+                wp_enqueue_style( 'admin-bar' );
+
+                if ( is_super_admin() ) {
+                        wp_enqueue_style( 'super-admin-bar' );
+                }
+                
+                do_action( 'admin_bar_init' );
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         function add_menu( $args = array() ) {
</span><span class="lines">@@ -44,26 +66,19 @@
</span><span class="cx">                 if ( empty( $id ) )
</span><span class="cx">                         $id = esc_attr( sanitize_title( trim( $title ) ) );
</span><span class="cx"> 
</span><del>-                if ( !empty( $parent ) ) {
</del><ins>+                if ( ! empty( $parent ) ) {
</ins><span class="cx">                         /* Add the menu to the parent item */
</span><del>-                        $child = array(
-                                'id' =&gt; $id,
-                                'title' =&gt; $title,
-                                'href' =&gt; $href
-                        );
</del><ins>+                        $child = array( 'id' =&gt; $id, 'title' =&gt; $title, 'href' =&gt; $href );
</ins><span class="cx"> 
</span><del>-                        if ( !empty( $meta ) )
</del><ins>+                        if ( ! empty( $meta ) )
</ins><span class="cx">                                 $child['meta'] = $meta;
</span><span class="cx"> 
</span><span class="cx">                         $this-&gt;add_node( $parent, $this-&gt;menu, $child );
</span><span class="cx">                 } else {
</span><span class="cx">                         /* Add the menu item */
</span><del>-                        $this-&gt;menu-&gt;{$id} = array(
-                                'title' =&gt; $title,
-                                'href' =&gt; $href
-                        );
</del><ins>+                        $this-&gt;menu-&gt;{$id} = array( 'title' =&gt; $title, 'href' =&gt; $href );
</ins><span class="cx"> 
</span><del>-                        if ( !empty( $meta ) )
</del><ins>+                        if ( ! empty( $meta ) )
</ins><span class="cx">                                 $this-&gt;menu-&gt;{$id}['meta'] = $meta;
</span><span class="cx">                 }
</span><span class="cx">         }
</span><span class="lines">@@ -73,7 +88,7 @@
</span><span class="cx">         }
</span><span class="cx">         
</span><span class="cx">         function render() {
</span><del>-        ?&gt;
</del><ins>+                ?&gt;
</ins><span class="cx">                 &lt;div id=&quot;wpadminbar&quot; class=&quot;snap_nopreview no-grav&quot;&gt;
</span><span class="cx">                         &lt;div class=&quot;quicklinks&quot;&gt;
</span><span class="cx">                                 &lt;ul&gt;
</span><span class="lines">@@ -85,7 +100,8 @@
</span><span class="cx"> 
</span><span class="cx">                         &lt;div id=&quot;adminbarsearch-wrap&quot;&gt;
</span><span class="cx">                                 &lt;form action=&quot;&lt;?php echo home_url(); ?&gt;&quot; method=&quot;get&quot; id=&quot;adminbarsearch&quot;&gt;
</span><del>-                                        &lt;input class=&quot;adminbar-input&quot; name=&quot;s&quot; id=&quot;s&quot; type=&quot;text&quot; value=&quot;&lt;?php esc_attr_e( 'Search' ); ?&gt;&quot; maxlength=&quot;150&quot; onfocus=&quot;this.value=(this.value=='&lt;?php esc_attr_e( 'Search' ); ?&gt;') ? '' : this.value;&quot; onblur=&quot;this.value=(this.value=='') ? '&lt;?php esc_attr_e( 'Search' ); ?&gt;' : this.value;&quot; /&gt; &lt;button type=&quot;submit&quot; class=&quot;adminbar-button&quot;&gt;&lt;span&gt;&lt;?php _e('Search'); ?&gt;&lt;/span&gt;&lt;/button&gt;
</del><ins>+                                        &lt;input class=&quot;adminbar-input&quot; name=&quot;s&quot; id=&quot;adminbar-search&quot; type=&quot;text&quot; title=&quot;&lt;?php esc_attr_e( 'Search' ); ?&gt;&quot; value=&quot;&quot; maxlength=&quot;150&quot; /&gt; 
+                                        &lt;button type=&quot;submit&quot; class=&quot;adminbar-button&quot;&gt;&lt;span&gt;&lt;?php _e('Search'); ?&gt;&lt;/span&gt;&lt;/button&gt;
</ins><span class="cx">                                 &lt;/form&gt;
</span><span class="cx">                         &lt;/div&gt;
</span><span class="cx">                 &lt;/div&gt;
</span><span class="lines">@@ -97,12 +113,36 @@
</span><span class="cx"> 
</span><span class="cx">         /* Helpers */
</span><span class="cx">         function recursive_render( $id, &amp;$menu_item ) { ?&gt;
</span><del>-                &lt;?php $menuclass = ( !empty( $menu_item['children'] ) ) ? 'menupop ' : ''; ?&gt;
</del><ins>+                &lt;?php $menuclass = ( ! empty( $menu_item['children'] ) ) ? 'menupop ' : ''; ?&gt;
</ins><span class="cx"> 
</span><del>-                &lt;li class=&quot;&lt;?php echo $menuclass . &quot;ab-$id&quot; ?&gt;&lt;?php if ( !empty( $menu_item['meta']['class'] ) ) : ?&gt;&lt;?php echo ' ' . $menu_item['meta']['class'] ?&gt;&lt;?php endif; ?&gt;&quot;&gt;
-                        &lt;a href=&quot;&lt;?php echo strip_tags( $menu_item['href'] ) ?&gt;&quot;&lt;?php if ( !empty( $menu_item['meta']['onclick'] ) ) :?&gt; onclick=&quot;&lt;?php echo $menu_item['meta']['onclick'] ?&gt;&quot;&lt;?php endif; ?&gt;&lt;?php if ( !empty( $menu_item['meta']['target'] ) ) :?&gt; target=&quot;&lt;?php echo $menu_item['meta']['target'] ?&gt;&quot;&lt;?php endif; ?&gt;&gt;&lt;?php if ( !empty( $menuclass ) ) : ?&gt;&lt;span&gt;&lt;?php endif; ?&gt;&lt;?php echo $menu_item['title'] ?&gt;&lt;?php if ( !empty( $menuclass ) ) : ?&gt;&lt;/span&gt;&lt;?php endif; ?&gt;&lt;/a&gt;
</del><ins>+                &lt;li class=&quot;&lt;?php echo $menuclass . &quot;ab-$id&quot; ?&gt;&lt;?php 
+                        if ( ! empty( $menu_item['meta']['class'] ) ) : 
+                                echo ' ' . $menu_item['meta']['class'];
+                        endif; 
+                ?&gt;&quot;&gt;
+                        &lt;a href=&quot;&lt;?php echo strip_tags( $menu_item['href'] ) ?&gt;&quot;&lt;?php 
+                                if ( ! empty( $menu_item['meta']['onclick'] ) ) :
+                                        ?&gt; onclick=&quot;&lt;?php echo $menu_item['meta']['onclick']; ?&gt;&quot;&lt;?php 
+                                endif;
+                        if ( ! empty( $menu_item['meta']['target'] ) ) :
+                                ?&gt; target=&quot;&lt;?php echo $menu_item['meta']['target']; ?&gt;&quot;&lt;?php 
+                        endif; 
+                        
+                        ?&gt;&gt;&lt;?php 
+                        
+                        if ( ! empty( $menuclass ) ) : 
+                                ?&gt;&lt;span&gt;&lt;?php 
+                        endif; 
+                        
+                        echo $menu_item['title'];
+                        
+                        if ( ! empty( $menuclass ) ) : 
+                                ?&gt;&lt;/span&gt;&lt;?php 
+                        endif; 
+                        
+                        ?&gt;&lt;/a&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;?php if ( !empty( $menu_item['children'] ) ) : ?&gt;
</del><ins>+                        &lt;?php if ( ! empty( $menu_item['children'] ) ) : ?&gt;
</ins><span class="cx">                         &lt;ul&gt;
</span><span class="cx">                                 &lt;?php foreach ( $menu_item['children'] as $child_id =&gt; $child_menu_item ) : ?&gt;
</span><span class="cx">                                         &lt;?php $this-&gt;recursive_render( $child_id, $child_menu_item ); ?&gt;
</span><span class="lines">@@ -110,7 +150,7 @@
</span><span class="cx">                         &lt;/ul&gt;
</span><span class="cx">                         &lt;?php endif; ?&gt;
</span><span class="cx"> 
</span><del>-                        &lt;?php if ( !empty( $menu_item['meta']['html'] ) ) : ?&gt;
</del><ins>+                        &lt;?php if ( ! empty( $menu_item['meta']['html'] ) ) : ?&gt;
</ins><span class="cx">                                 &lt;?php echo $menu_item['meta']['html']; ?&gt;
</span><span class="cx">                         &lt;?php endif; ?&gt;
</span><span class="cx">                 &lt;/li&gt;&lt;?php
</span><span class="lines">@@ -124,14 +164,29 @@
</span><span class="cx">                                 return true;
</span><span class="cx">                         }
</span><span class="cx"> 
</span><del>-                        if ( !empty( $menu-&gt;{$id}['children'] ) )
</del><ins>+                        if ( ! empty( $menu-&gt;{$id}['children'] ) )
</ins><span class="cx">                                 $this-&gt;add_node( $parent_id, $menu-&gt;{$id}['children'], $child );
</span><span class="cx">                 }
</span><ins>+                
</ins><span class="cx">                 $child = null;
</span><span class="cx"> 
</span><span class="cx">                 return false;
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        function add_menus() {
+                add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_me_separator', 10 );
+                add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_account_menu', 20 );
+                add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_blogs_menu', 30 );
+                add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_blog_separator', 40 );
+                add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_bloginfo_menu', 50 );
+                add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_edit_menu', 100 );
+                
+                if ( is_multisite() &amp;&amp; is_super_admin() &amp;&amp; function_exists('wp_admin_bar_superadmin_settings_menu') )
+                        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_superadmin_settings_menu', 1000 );
+
+                do_action('add_admin_bar_menus');
+        }
+
</ins><span class="cx">         function remove_node( $id, &amp;$menu ) {
</span><span class="cx">                 foreach( $menu as $menu_item_id =&gt; &amp;$menu_item ) {
</span><span class="cx">                         if ( $menu_item_id == $id ) {
</span><span class="lines">@@ -139,7 +194,7 @@
</span><span class="cx">                                 return true;
</span><span class="cx">                         }
</span><span class="cx"> 
</span><del>-                        if ( !empty( $menu-&gt;{$menu_item_id}['children'] ) )
</del><ins>+                        if ( ! empty( $menu-&gt;{$menu_item_id}['children'] ) )
</ins><span class="cx">                                 $this-&gt;remove_node( $id, $menu-&gt;{$menu_item_id}['children'] );
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="lines">@@ -148,7 +203,8 @@
</span><span class="cx"> 
</span><span class="cx">         function load_user_locale_translations() {
</span><span class="cx">                 $this-&gt;need_to_change_locale = ( get_locale() != $this-&gt;user-&gt;locale );
</span><del>-                if ( !$this-&gt;need_to_change_locale ) return;
</del><ins>+                if ( ! $this-&gt;need_to_change_locale ) 
+                        return;
</ins><span class="cx">                 $this-&gt;previous_translations = get_translations_for_domain( 'default' );
</span><span class="cx">                 $this-&gt;adminbar_locale_filter = lambda( '$_', '$GLOBALS[&quot;wp_admin_bar&quot;]-&gt;user-&gt;locale;' );
</span><span class="cx">                 unload_textdomain( 'default' );
</span><span class="lines">@@ -159,10 +215,10 @@
</span><span class="cx"> 
</span><span class="cx">         function unload_user_locale_translations() {
</span><span class="cx">                 global $l10n;
</span><del>-                if ( !$this-&gt;changed_locale ) return;
</del><ins>+                if ( ! $this-&gt;changed_locale ) 
+                        return;
</ins><span class="cx">                 remove_filter( 'locale', $this-&gt;adminbar_locale_filter );
</span><span class="cx">                 $l10n['default'] = &amp;$this-&gt;previous_translations;
</span><del>-
</del><span class="cx">         }
</span><span class="cx"> }
</span><span class="cx"> ?&gt;
</span></span></pre></div>
<a id="trunkwpincludesadminbaradminbarcssphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-includes/admin-bar/admin-bar-css.php (16037 => 16038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar/admin-bar-css.php        2010-10-28 08:31:16 UTC (rev 16037)
+++ trunk/wp-includes/admin-bar/admin-bar-css.php        2010-10-28 08:31:36 UTC (rev 16038)
</span><span class="lines">@@ -1,453 +0,0 @@
</span><del>-&lt;?php 
-        header( 'Content-type: text/css' );
-        $proto = ( empty( $_GET['p'] ) ) ? 'http://' : 'https://';
-        $text_direction =  $_GET['td'];
-        if ( 'ltr' == $text_direction || empty( $_GET['td'] ) )
-                $sprite = $_GET['inc'] . 'images/admin-bar-sprite.png?d=08102010';
-        else
-                $sprite = $_GET['inc'] . 'images/admin-bar-sprite-rtl.png?d=08102010';
-?&gt;
-
-#wpadminbar { direction:ltr; background:#666 url(&lt;?php echo $sprite; ?&gt;) 0 -222px repeat-x; color:#ddd; font:12px Arial, Helvetica, sans-serif; height:28px; left:0; margin:0; position:fixed; top:0; width:100%; z-index:99999; min-width: 960px; }
-#wpadminbar ul, #wpadminbar ul li { position: relative; z-index: 99999; }
-#wpadminbar ul li img { vertical-align: middle !important; margin-right: 8px !important; border: none !important; padding: 0 !important; }
-#wpadminbar .quicklinks &gt; ul &gt; li &gt; a { border-right: 1px solid #686868; border-left: 1px solid #808080; }
-#wpadminbar .quicklinks &gt; ul &gt; li.ab-subscriptions &gt; a, #wpadminbar .quicklinks &gt; ul &gt; li:last-child &gt; a { border-right: none; }
-#wpadminbar .quicklinks &gt; ul &gt; li.hover &gt; a { border-left-color: #707070; }
-#wpadminbar a { outline: none; }
-#wpadminbar .avatar {border:1px solid #999 !important;padding:0 !important;margin:-3px 5px 0 0 !important;vertical-align:middle;float:none;display:inline !important; }
-#wpadminbar .menupop ul li a {color:#555 !important;text-shadow:none;font-weight:normal;white-space:nowrap;}
-#wpadminbar .menupop a &gt; span {background:url(&lt;?php echo $sprite; ?&gt;) 100% 100.4% no-repeat;padding-right:.8em;line-height: 28px;}
-#wpadminbar .menupop ul li a &gt; span { display: block; background:url(&lt;?php echo $sprite; ?&gt;) 100% 97.2% no-repeat;padding-right:1.5em;line-height: 28px;}
-#wpadminbar .menupop ul li a span#awaiting-mod { display: inline; background: #aaa; color: #fff; padding: 1px 5px; font-size: 10px; font-family: verdana; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }
-#wpadminbar .menupop ul li a:hover span#awaiting-mod { background: #fff; color: #888; }
-#wpadminbar .menupop ul {-moz-box-shadow:0 4px 8px rgba(0,0,0,0.1);-webkit-box-shadow:0 4px 8px rgba(0,0,0,0.1);background:#fff;display:none;position:absolute;border:1px solid #dfdfdf;border-top:none !important;float:none}
-html&gt;body #wpadminbar .menupop ul {background:rgba(255,255,255,0.97);border-color:rgba(0,0,0,0.1);}
-#wpadminbar .menupop.ab-my-account ul, #wpadminbar .menupop.ab-my-dash ul, #wpadminbar .menupop.ab-new-post ul {min-width:140px}
-#wpadminbar .menupop li {float:none;margin:0;padding:0;background-image:none;}
-#wpadminbar .quicklinks a {border:none;color:#ddd !important;text-shadow:#555 0px -1px 0px;display:block;font:13px Arial, Helvetica, sans-serif;font-weight:normal;letter-spacing:normal;padding:0 0.85em;line-height:28px;text-decoration:none !important;}
-#wpadminbar .quicklinks a:hover {text-shadow:#333 0px -1px 0px;}
-#wpadminbar li.ab-privacy { float: right; background: #333; }
-#wpadminbar li.ab-privacy &gt; a &gt; span { background: none; padding: 0;  }
-#wpadminbar li.ab-privacy span#priv-icon { display: block; text-indent: -999em; background:url(&lt;?php echo $sprite; ?&gt;) 40% 59.7% no-repeat; padding: 0; width: 13px; margin-right: -3px; }
-
-#wpadminbar li.ab-sadmin { float: right; background: #555 }
-#wpadminbar li.ab-sadmin ul, #wpadminbar li.ab-privacy ul { right: 0; float: right; }
-#wpadminbar li.ab-sadmin &gt; a { font-size: 11px !important; padding: 0 7px !important; border: none !important; border-left: 1px solid #666 !important; }
-
-#wpadminbar li.ab-sadmin ul a, #wpadminbar li.ab-privacy a { border-right: none !important; border-left: none !important; }
-#wpadminbar li.ab-sadmin ul li { right: 0; float: right; text-align: left; width: 100%; }
-#wpadminbar li.ab-sadmin ul li a { padding-left: 1.75em; } 
-#wpadminbar li.ab-sadmin ul li a &gt; span { background:url(&lt;?php echo $sprite; ?&gt;) 0% 101.8% no-repeat;padding-left: 1.25em; margin-left: -1.25em; line-height: 28px; padding-right: 0 !important; }
-#wpadminbar li a.loading { background: url(&lt;/ajax-loader.gif) 10px 50% no-repeat !important; padding-left: 29px; }
-#wpadminbar li.subscribed a strong { background:url(&lt;?php echo $sprite; ?&gt;) 32% 59.8% no-repeat !important; text-indent: -999em; overflow: hidden; padding: 0 16px 0 0; height: 28px; display: block; float: left; margin-right: 2px; }
-
-#wpadminbar li:hover {background: #555 url(&lt;?php echo $sprite; ?&gt;) 0 -282px repeat-x;}
-#wpadminbar li li:hover { color:#fff !important; background: #888 url(&lt;?php echo $sprite; ?&gt;) 0 -222px repeat-x !important;text-shadow: #666 0px -1px 0px;}
-#wpadminbar li li:hover &gt; a { color:#fff !important; }
-.quicklinks ul {list-style:none;margin:0;padding:0;text-align:left}
-.quicklinks ul li {float:left;margin:0}
-
-#adminbarlogin {float:left;display:inline;}
-
-#adminbarsearch {float:right; }
-#adminbarsearch {height: 18px;padding: 3px;}
-#adminbarsearch * {color: #555;font-size:12px;}
-#adminbarsearch label, #adminbarsearch a { height: 28px; color: #ccc; display:block;float:left;padding:3px 4px;text-shadow:0px -1px 0px #444;}
-#adminbarsearch a {text-decoration:underline;}
-#adminbarsearch a:hover {color:#fff;}
-
-#wpadminbar li.ab-me:hover, #wpadminbar li.ab-blog:hover { background:none;}
-#wpadminbar li.ab-me &gt; a, #wpadminbar li.ab-blog &gt; a { line-height: 18px !important; border: none !important; background:url(&lt;?php echo $sprite; ?&gt;) 100% 59.8% no-repeat; height: 28px; padding: 0 1.15em 0 0.7em; }
-#wpadminbar li.ab-me &gt; a.hover, #wpadminbar li.ab-blog &gt; a.hover { background-position: 67% 59.8%; }
-#wpadminbar li.ab-me img.avatar, #wpadminbar li.ab-blog img.avatar { margin: 4px 0 0 0 !important; vertical-align: middle; background: #eee; width: 16px !important; height: 16px !important; }
-#wpadminbar li.ab-my-account a, #wpadminbar li.ab-bloginfo a { border-left: none !important; padding-left: 0.7em !important; margin-top: 0 !important; }
-#wpadminbar li.ab-my-account &gt; ul, #wpadminbar li.ab-bloginfo &gt; ul { left: -7px; }
-#wpadminbar ul li img { width: 16px !important; height: 16px !important; }
-
-#wpadminbar ul li a strong.count { text-shadow: none; background: #ddd; color: #555; margin-left: 5px; padding: 1px 6px; top: -1px; position: relative; font-size: 9px; -moz-border-radius: 7px; -webkit-border-radius: 7px; border-radius: 7px; font-weight: normal }
-
-#wpadminbar #q {
-        line-height:normal !important;
-        width:140px !important;
-        margin-top:0px !important;
-}
-.adminbar-input {
-        display:block !important;
-        float:left !important;
-        font:12px Arial,Helvetica,sans-serif !important;
-        border:1px solid #626262 !important;
-        padding:2px 3px !important;
-        margin-right:3px !important;
-        background:#ddd url(&lt;?php echo $sprite; ?&gt;) top left no-repeat !important;
-        -webkit-border-radius:0 !important;
-        -khtml-border-radius:0 !important;
-        -moz-border-radius:0 !important;
-        border-radius:0 !important;
-        outline:none;
-        text-shadow:0 1px 0 #fff;
-}
-button.adminbar-button {
-        position:relative;
-        border:0;
-        cursor:pointer;
-        overflow:visible;
-        margin:0 !important;
-        float:left;
-        background:url(&lt;?php echo $sprite; ?&gt;) right -107px no-repeat;
-        padding:0 14px 0 0;
-        text-align:center;
-}
-button.adminbar-button span {
-        position:relative;
-        display:block;
-        white-space:nowrap;
-        height:19px;
-        background:url(&lt;?php echo $sprite; ?&gt;) left -69px no-repeat;
-        padding:3px 0 0 14px;
-        font:12px Arial,Helvetica,sans-serif !important;
-        font-weight:bold !important;
-        color:#444 !important;
-        text-shadow:0px 1px 0px #eee !important;
-}
-button.adminbar-button:active {
-        background-position:right -184px !important;
-        text-shadow:0px 1px 0px #eee !important;
-}
-button.adminbar-button:hover span {
-        color:#000 !important;
-}
-button.adminbar-button:active span {
-        background-position:left -146px !important;
-}
-button.adminbar-button::-moz-focus-inner {
-        border:none;
-}
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-        button.adminbar-button span {
-                margin-top: -1px;
-        }
-}
-
-&lt;?php if ( 'rtl' == $text_direction ) : ?&gt;
-        #wpadminbar {
-                direction:rtl;
-                font-family: Tahoma, Arial ,sans-serif;
-                right:0;
-                left:auto;
-        }
-        #wpadminbar div, #wpadminbar ul, #wpadminbar ul li {
-                min-height: 0;
-        }
-        #wpadminbar ul li img {  margin-left: 8px !important; margin-right: 0 !important; }
-        #wpadminbar .quicklinks &gt; ul &gt; li &gt; a { border-left: 1px solid #686868; border-right: 1px solid #808080;}
-        #wpadminbar .quicklinks &gt; ul &gt; li.ab-subscriptions &gt; a, #wpadminbar .quicklinks &gt; ul &gt; li:last-child &gt; a { border-left: none; border-right: 1px solid #808080;}
-        #wpadminbar .quicklinks &gt; ul &gt; li.hover &gt; a { border-right-color: #707070; border-left-color: #686868; }
-        #wpadminbar .avatar {margin: -3px  0 0 5px !important; float:none;  }
-        #wpadminbar .menupop a &gt; span {background-position: 0 100.4%; padding-left:.8em;}
-        #wpadminbar .menupop ul li a &gt; span { background-position: 0% 97.2%; padding-right:0;padding-left:1.5em }
-        #wpadminbar .menupop ul {right: 0; width:100%; min-width:150px;}
-        #wpadminbar .ab-my-account ul { width:200px;}
-        #wpadminbar .ab-my-blogs ul { width:300px;}
-        #wpadminbar .ab-my-blogs ul ul { width:200px;}
-        #wpadminbar .ab-subscribe ul { width:150px;}
-        #wpadminbar .ab-bloginfo ul { width:200px;}
-        #wpadminbar .ab-subscribe ul { width:150px;}
-        #wpadminbar .ab-subscriptions ul { width:200px;}
-        #wpadminbar .menupop ul li {width:auto}
-        #wpadminbar .quicklinks a {font-family: Tahoma, Arial, Helvetica, sans-serif;}
-        #wpadminbar li.ab-privacy { float: left; }
-        #wpadminbar li.ab-privacy span#priv-icon { text-indent: 999em; background-position: 60% 59.7%; padding: 0; margin-right: 0; margin-left: -3px;}
-
-        #wpadminbar li.ab-sadmin { float: left;  }
-        #wpadminbar li.ab-sadmin ul, #wpadminbar li.ab-privacy ul { right: auto; left: 0; float: left; }
-        #wpadminbar li.ab-sadmin &gt; a { border-right: 1px solid #666 !important; border-left:none !important;}
-
-        #wpadminbar li.ab-sadmin ul a, #wpadminbar li.ab-privacy a { border-right: none !important; border-left: none !important; }
-        #wpadminbar li.ab-sadmin ul li { left: 0; right:auto; float: left; text-align: right;  }
-
-
-        #wpadminbar li.ab-sadmin ul li a { padding-right: 1.75em; padding-left: 0 } 
-        #wpadminbar li.ab-sadmin ul li a &gt; span { background-position: 100% 101.8%; padding-right: 1.25em !important; padding-left: 0 !important; margin-right: -1.25em; margin-left: 0; }
-        #wpadminbar li a.loading { background-position: right 50% !important; padding-right: 29px; padding-left: 0;}
-        #wpadminbar li.subscribed a strong { background-position: 68% 59.8% !important;  padding: 0 0 0 16px; float: right; margin-left: 2px; }
-
-
-        .quicklinks ul {text-align:right}
-        .quicklinks ul li {float:right;}
-
-        #adminbarlogin {float:right;}
-
-        #adminbarsearch {display:none;}
-        #adminbarsearch label, #adminbarsearch a { float:right;}
-
-        #wpadminbar li.ab-me &gt; a, #wpadminbar li.ab-blog &gt; a { background-position:0% 59.8%; padding: 0 0.7em 0 1.15em; }
-        #wpadminbar li.ab-me &gt; a.hover, #wpadminbar li.ab-blog &gt; a.hover { background-position: 33% 59.8%; }
-        #wpadminbar li.ab-my-account a, #wpadminbar li.ab-bloginfo a { border-right: none !important; padding-right: 0.7em !important;  }
-        #wpadminbar li.ab-my-account &gt; ul, #wpadminbar li.ab-bloginfo &gt; ul { right: -7px; left:auto;}
-
-        #wpadminbar ul li a strong.count { margin-right: 5px; margin-left: 0; position:static}
-
-
-        .adminbar-input {
-                float:right !important;
-                font-family: Tahoma, Arial,Helvetica,sans-serif !important;
-                margin-right:3px !important;
-                margin-left:0 !important;
-                background-position: right top !important;
-        }
-        button.adminbar-button {
-                float:right;
-                background-position: left -107px;
-                padding:0 0 0 14px;
-        }
-        button.adminbar-button span {
-                background-position: right -69px;
-                padding:3px 14px 0 0;
-                font-family: Tahoma, Arial,Helvetica,sans-serif !important;
-        }
-        button.adminbar-button:active {
-                background-position:left -184px !important;
-        }
-        button.adminbar-button:active span {
-                background-position:right -146px !important;
-        }
-&lt;?php
-endif;
-
-$current_theme = str_replace( '+', ' ', $_GET['t'] );
-$is_admin = $_GET['a'];
-$is_super_admin = $_GET['sa'];
-
-if ( ( empty($_GET['nobump']) || $is_admin ) &amp;&amp; !strpos( $_SERVER['REQUEST_URI'], 'media-upload.php' ) ) : ?&gt;
-        body { padding-top: 28px !important; }
-&lt;?php endif; ?&gt;
-
-&lt;?php if ( in_array( $current_theme, array('H3', 'H4', 'The Journalist v1.9') ) ) { ?&gt;
-        body { padding-top: 28px; background-position: 0px 28px; }
-&lt;?php } ?&gt;
-
-&lt;?php if ( $is_super_admin ) : ?&gt;
-        #querylist {
-                font-family: Arial, Tahoma, sans-serif;
-                display: none;
-                position: absolute;
-                top: 50px;
-                left: 50px;
-                right: 50px;
-                background: #fff;
-                padding: 20px;
-                -moz-box-shadow: 0 0 15px #888;
-                -webkit-box-shadow: 0 0 15px #888;
-                box-shadow: 0 0 15px #888;
-                z-index: 99999;
-                border: 10px solid #f0f0f0;
-                color: #000;
-                line-height: 150% !important;
-        }
-        #querylist pre {
-                font-size: 12px;
-                padding: 10px;
-        }
-        
-        #querylist h1 {
-                font-family: georgia, times, serif;
-                text-align: center;
-                font-size: 24px;
-                padding: 20px 5px;
-                background: #eee;
-                color: #555;
-                margin: 0;
-        }
-        #querylist div#debug-status {
-                background: #ccc;
-                color: #fff;
-                overflow: hidden;
-                height: 21px;
-                font-size: 14px;
-                font-family: georgia, times, serif;
-                padding: 7px 15px;
-        }
-        #querylist .left { float: left; }
-        #querylist .right { float: right; }
-        
-        #querylist h1, #querylist h2, #querylist h3 {
-                font-weight: normal;
-        }
-        
-        #querylist ul.debug-menu-links {
-                clear: left;
-                background: #ccc;
-                padding: 10px 15px 0;
-                overflow: hidden;
-                list-style: none;
-                margin: 0;
-                padding: 0 0 0 15px;
-        }
-                #querylist ul.debug-menu-links li {
-                        float: left;
-                        margin-right: 10px;
-                        margin-bottom: 0 !important;
-                }
-                
-                #querylist ul.debug-menu-links li a {
-                        outline: none;
-                        display: block;
-                        padding: 5px 9px;
-                        margin-right: 0;
-                        background: #bbb;
-                        color: #fff !important;
-                        text-decoration: none !important;
-                        font-weight: normal;
-                        font-size: 12px;
-                        color: #555;
-                        -webkit-border-top-right-radius: 4px;                        
-                        -webkit-border-top-left-radius: 4px;
-                        -moz-border-radius-topright: 4px;
-                        -moz-border-radius-topleft: 4px;
-                }
-                        #querylist ul.debug-menu-links li.current a {
-                                background: #fff;
-                                color: #555 !important;
-                        }
-        
-        #querylist h2 {
-                float: left;
-                min-width: 150px;
-                border: 1px solid #eee;
-                padding: 5px 10px 15px;
-                clear: none; important;
-                text-align: center;
-                font-family: georgia, times, serif;
-                font-size: 28px;
-                margin: 15px 10px 15px 0 !important;
-        }
-                #querylist h2 span {
-                        font-size: 12px;
-                        color: #888;
-                        text-transform: uppercase;
-                        white-space: nowrap;
-                        display: block;
-                        margin-bottom: 5px;
-                }
-
-        #object-cache-stats h2 {
-                border: none;
-                float: none;
-                text-align: left;
-                font-size: 22px;
-                margin-bottom: 0;
-        }
-
-        #object-cache-stats ul.debug-menu-links {
-                padding: 0;
-                margin: 0;
-                background: none;
-        }
-                #object-cache-stats ul.debug-menu-links li {
-                        float: left;
-                        margin-bottom: 10px !important;
-                        background: none !important;
-                        border: 1px solid #eee !important;
-                        color: #555 !important;
-                }
-                        #object-cache-stats ul.debug-menu-links li.current a {
-                                background: #ccc !important;
-                                color: #fff !important;
-                                -webkit-border-top-right-radius: 0;                        
-                                -webkit-border-top-left-radius: 0;
-                                -moz-border-radius-topright: 0;
-                                -moz-border-radius-topleft: 0;
-                        }
-                        
-                        #object-cache-stats ul.debug-menu-links li a {
-                                background: none;
-                                color: #555 !important;
-                                overflow: hidden;
-                        }
-        
-        #querylist h3 {
-                margin-bottom: 15px;
-        }
-
-        #querylist ol#wpd-queries {
-                padding: 0 !important;
-                margin: 0 !important;
-                list-style: none;
-                clear: left;
-        }
-                #querylist ol#wpd-queries li {
-                        padding: 10px;
-                        background: #f0f0f0;
-                        margin: 0 0 10px 0;
-                }
-                        #querylist ol#wpd-queries li div.qdebug {
-                                background: #e8e8e8;
-                                margin: 10px -10px -10px -10px;
-                                padding: 5px 150px 5px 5px;
-                                font-size: 11px;
-                                position: relative;
-                                min-height: 20px;
-                        }
-                        
-                        #querylist ol#wpd-queries li div.qdebug span {
-                                position: absolute;
-                                right: 10px;
-                                top: 5px;
-                                white-space: nowrap;
-                        }
-        
-        #querylist a {
-                text-decoration: underline !important;
-                color: blue !important;
-        }
-        #querylist a:hover {
-                text-decoration: none !important;
-        }
-        #querylist .debug-menu-target {
-                display: none;
-        }
-        
-        #querylist ol {
-                font: 12px Monaco, &quot;Courier New&quot;, Courier, Fixed !important;
-                line-height: 180% !important;
-        }
-        
-        #wpadminbar #admin-bar-micro ul li {
-                list-style-type: none;
-                position: relative;
-                margin: 0;
-                padding: 0;
-        }
-        #wpadminbar #admin-bar-micro ul ul, #wpadminbar #admin-bar-micro #awaiting-mod, #wpadminbar .ab-sadmin .count-0 {
-                display: none !important;
-        }
-        #wpadminbar #admin-bar-micro ul li:hover &gt; ul {
-                display: block;
-                position: absolute;
-                top: -1px;
-                left: 100%;
-        }
-        #wpadminbar #admin-bar-micro li a {
-                display: block;
-                text-decoration: none;
-        }
-        #wpadminbar #admin-bar-micro li li a {
-                background: #ddd;
-        }
-        #wpadminbar #admin-bar-micro li li li a {
-                background: #fff;
-        }
-        
-        &lt;?php if ( 'rtl' == $text_direction ) : ?&gt;
-        
-                #querylist {
-                        direction: ltr;
-                }
-                
-                #wpadminbar #admin-bar-micro ul li:hover &gt; ul {
-                        left: auto;
-                        right: 100%;
-                }
-        &lt;?php endif; ?&gt;
-&lt;?php endif; ?&gt;
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesadminbaradminbardebugphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar/admin-bar-debug.php (16037 => 16038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar/admin-bar-debug.php        2010-10-28 08:31:16 UTC (rev 16037)
+++ trunk/wp-includes/admin-bar/admin-bar-debug.php        2010-10-28 08:31:36 UTC (rev 16038)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> function wp_admin_bar_debug_menu() {
</span><span class="cx">         global $wp_admin_bar, $wpdb;
</span><span class="cx"> 
</span><del>-        if ( !is_super_admin() || !apply_filters('wp_admin_bar_enable_debug_menu', false) )
</del><ins>+        if ( ! is_super_admin() || ! apply_filters('wp_admin_bar_enable_debug_menu', false ) )
</ins><span class="cx">                 return;
</span><span class="cx"> 
</span><span class="cx">         $queries = $wpdb-&gt;num_queries;
</span><span class="lines">@@ -44,6 +44,15 @@
</span><span class="cx"> ?&gt;
</span><span class="cx">         &lt;script type=&quot;text/javascript&quot;&gt;
</span><span class="cx">         /* &lt;![CDATA[ */
</span><ins>+        var toggle_query_list = function() { 
+                var querylist = document.getElementById( 'querylist' );
+                if( querylist &amp;&amp; querylist.style.display == 'block' ) {
+                        querylist.style.display='none';
+                } else {
+                        querylist.style.display='block';
+                }
+        }
+
</ins><span class="cx">         var clickDebugLink = function( targetsGroupId, obj) {
</span><span class="cx">                 var sectionDivs = document.getElementById( targetsGroupId ).childNodes;
</span><span class="cx">                 for ( var i = 0; i &lt; sectionDivs.length; i++ ) {
</span><span class="lines">@@ -158,4 +167,4 @@
</span><span class="cx">         return $out;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-?&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+?&gt;
</ins></span></pre></div>
<a id="trunkwpincludesadminbaradminbarsuperadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar/admin-bar-superadmin.php (16037 => 16038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar/admin-bar-superadmin.php        2010-10-28 08:31:16 UTC (rev 16037)
+++ trunk/wp-includes/admin-bar/admin-bar-superadmin.php        2010-10-28 08:31:36 UTC (rev 16038)
</span><span class="lines">@@ -1,19 +1,5 @@
</span><span class="cx"> &lt;?php
</span><del>-/**
- * Use the $wp_admin_bar global to add a menu for site admins and administrator controls.
- */
-function wp_admin_bar_superadmin_menus() {
-        global $wp_admin_bar, $wpdb;
</del><span class="cx"> 
</span><del>-        if ( !is_object( $wp_admin_bar ) || !is_super_admin() )
-                return false;
-
-        /* Add the &quot;Super Admin&quot; settings sub menu */
-        if ( is_multisite() )
-                wp_admin_bar_superadmin_settings_menu();
-}
-add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_superadmin_menus', 1000 );
-
</del><span class="cx"> /**
</span><span class="cx">  *
</span><span class="cx">  * Use the $wp_admin_bar global to add the super admin menu, providing admin options only visible to super admins.
</span><span class="lines">@@ -21,35 +7,47 @@
</span><span class="cx"> function wp_admin_bar_superadmin_settings_menu() {
</span><span class="cx">         global $wp_admin_bar, $current_blog, $current_user;
</span><span class="cx"> 
</span><del>-        if ( !is_object( $wp_admin_bar ) || !is_super_admin() )
-                return false;
-
</del><span class="cx">         /* Add the main superadmin menu item */
</span><del>-        $wp_admin_bar-&gt;add_menu( array( 'id' =&gt; 'superadmin', 'title' =&gt; '&amp;mu;', 'href' =&gt; '', 'meta' =&gt; array( 'class' =&gt; 'ab-sadmin' ) ) );
</del><ins>+        $wp_admin_bar-&gt;add_menu( array(  'id' =&gt; 'superadmin', 'title' =&gt; '&amp;mu;', 'href' =&gt; '', 'meta' =&gt; array( 'class' =&gt; 'ab-sadmin' ), ) );
</ins><span class="cx"> 
</span><span class="cx">         wp_admin_bar_build_snackmenu();
</span><span class="cx"> 
</span><span class="cx">         /* Get the settings we need for the current site */
</span><span class="cx">         $matureaction = $current_blog-&gt;mature ? 'unmatureblog' : 'matureblog';
</span><del>-        $maturetext = $current_blog-&gt;mature ? esc_attr__('Unmark as mature') : esc_attr__('Mark as mature');
-        $suspendtext = $current_blog-&gt;spam ? esc_attr('Unsuspend site') : esc_attr('Suspend site');
</del><ins>+        $maturetext_confirm = $current_blog-&gt;mature ? 
+                sprintf( 
+                        esc_attr__( 'Are you sure you want to unmark %s as mature?' ),
+                        $current_blog-&gt;domain
+                ) : 
+                sprintf(
+                        esc_attr__( 'Are you sure you want to mark %s as mature?' ),
+                        $current_blog-&gt;domain
+                );
+
</ins><span class="cx">         $suspendaction = $current_blog-&gt;spam ? 'unspamblog' : 'spamblog';
</span><del>-        $mature_url = network_admin_url( &quot;edit.php?action=confirm&amp;amp;action2={$matureaction}&amp;amp;id={$current_blog-&gt;blog_id}&amp;amp;msg=&quot; . urlencode( 'Are you sure you want to ' . strtolower( $maturetext ) . &quot; {$current_blog-&gt;domain} as mature?&quot; ) );
-        $suspend_url = network_admin_url( &quot;edit.php?action=confirm&amp;amp;action2={$suspendaction}&amp;amp;id={$current_blog-&gt;blog_id}&amp;amp;msg=&quot; . urlencode( 'Are you sure you want to ' . strtolower( $suspendtext ) . &quot; {$current_blog-&gt;domain} ?&quot; ) );
</del><ins>+        $suspendtext_confirm = $current_blog-&gt;spam ?
+                sprintf( 
+                        esc_attr__( 'Are you sure you want to unsuspend site %s?' ),
+                        $current_blog-&gt;domain
+                ) : 
+                sprintf(
+                        esc_attr__( 'Are you sure you want to suspend site %s?' ),
+                        $current_blog-&gt;domain
+                );
+                
+        $mature_url = network_admin_url( &quot;edit.php?action=confirm&amp;amp;action2={$matureaction}&amp;amp;id={$current_blog-&gt;blog_id}&amp;amp;msg=&quot; . urlencode( $maturetext_confirm ) );
+        $suspend_url = network_admin_url( &quot;edit.php?action=confirm&amp;amp;action2={$suspendaction}&amp;amp;id={$current_blog-&gt;blog_id}&amp;amp;msg=&quot; . urlencode( $suspendtext_confirm ) );
</ins><span class="cx"> 
</span><span class="cx">         /* Add the submenu items to the Super Admin menu */
</span><del>-        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'superadmin', 'title' =&gt; __( 'Site Dashboard' ), 'href' =&gt; admin_url(), 'position' =&gt; 10 ) );
-        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'superadmin', 'title' =&gt; __( 'Site Options' ),  'href' =&gt; network_admin_url( &quot;sites.php?action=blogs&amp;amp;searchaction=id&amp;amp;s={$current_blog-&gt;blog_id}&quot; ), 'position' =&gt; 30 ) );
-        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'superadmin', 'title' =&gt; &quot;$maturetext&quot;, 'href' =&gt; $mature_url, 'position' =&gt; 50 ) );
-        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'superadmin', 'title' =&gt; &quot;$suspendtext&quot;, 'href' =&gt; $suspend_url, 'position' =&gt; 80 ) );
</del><ins>+        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'superadmin', 'title' =&gt; __( 'Site Dashboard' ), 'href' =&gt; admin_url(), 'position' =&gt; 10, ) );
+        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'superadmin', 'title' =&gt; __( 'Site Options' ), 'href' =&gt; network_admin_url( &quot;sites.php?action=blogs&amp;amp;searchaction=id&amp;amp;s={$current_blog-&gt;blog_id}&quot; ), 'position' =&gt; 30, ) );
+        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'superadmin', 'title' =&gt; ( $current_blog-&gt;mature ? __('Unmark as mature') : __('Mark as mature') ), 'href' =&gt; $mature_url, 'position' =&gt; 50, ) );
+        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'superadmin', 'title' =&gt; ( $current_blog-&gt;spam ? __('Unsuspend site') : __('Suspend site') ), 'href' =&gt; $suspend_url, 'position' =&gt; 80, ) );
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function wp_admin_bar_build_snackmenu() {
</span><span class="cx">         global $wp_admin_bar, $menu, $submenu, $pagenow;
</span><span class="cx"> 
</span><del>-        if ( !is_object( $wp_admin_bar ) || !is_super_admin() )
-                return false;
-
</del><span class="cx">         // Hide moderation count, filter removed at the bottom of this function
</span><span class="cx">         add_filter( 'wp_count_comments', 'wp_admin_bar_removemodcount' );
</span><span class="cx"> 
</span><span class="lines">@@ -60,7 +58,7 @@
</span><span class="cx">         require_once( ABSPATH . 'wp-admin/menu.php' );
</span><span class="cx"> 
</span><span class="cx">         /* Add the snack menu submenu to the superadmin menu */
</span><del>-        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'superadmin', 'title' =&gt; 'Snack Menu', 'href' =&gt; '/wp-admin/' ) );
</del><ins>+        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'superadmin', 'title' =&gt; __( 'Snack Menu' ), 'href' =&gt; '/wp-admin/',) );
</ins><span class="cx"> 
</span><span class="cx">         /* Loop through the submenus and add them */
</span><span class="cx">         foreach ( (array) $menu as $key =&gt; $item ) {
</span><span class="lines">@@ -74,11 +72,20 @@
</span><span class="cx">         
</span><span class="cx">                         if ( false !== $pos = strpos($menu_file, '?') )
</span><span class="cx">                                 $menu_file = substr($menu_file, 0, $pos);
</span><del>-                        if ( ( ('index.php' != $submenu[$item[2]][0][2]) &amp;&amp; file_exists(WP_PLUGIN_DIR . &quot;/$menu_file&quot;) ) || !empty($menu_hook)) {
</del><ins>+
+                        if ( 
+                                ( 
+                                        'index.php' != $submenu[$item[2]][0][2] &amp;&amp; 
+                                        file_exists( WP_PLUGIN_DIR . &quot;/$menu_file&quot; )
+                                ) || 
+                                ! empty( $menu_hook )
+                        ) {
+                                
</ins><span class="cx">                                 $admin_is_parent = true;
</span><del>-                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'snack-menu', 'title' =&gt; $item[0], 'href' =&gt; admin_url(&quot;admin.php?page={$submenu[$item[2]][0][2]}&quot;) ) );
</del><ins>+                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'snack-menu', 'title' =&gt; $item[0], 'href' =&gt; admin_url(&quot;admin.php?page={$submenu[$item[2]][0][2]}&quot;), ) );
+
</ins><span class="cx">                         } else {
</span><del>-                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'snack-menu', 'title' =&gt; $item[0], 'href' =&gt; admin_url(&quot;{$submenu[$item[2]][0][2]}&quot;) ) );
</del><ins>+                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'snack-menu', 'title' =&gt; $item[0], 'href' =&gt; admin_url(&quot;{$submenu[$item[2]][0][2]}&quot;), ) );
</ins><span class="cx">                         }
</span><span class="cx">                 } else if ( current_user_can($item[1]) ) {
</span><span class="cx">                         $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
</span><span class="lines">@@ -86,15 +93,23 @@
</span><span class="cx"> 
</span><span class="cx">                         if ( false !== $pos = strpos($menu_file, '?') )
</span><span class="cx">                                 $menu_file = substr($menu_file, 0, $pos);
</span><del>-                        if ( ('index.php' != $item[2]) &amp;&amp; file_exists(WP_PLUGIN_DIR . &quot;/$menu_file&quot;) || !empty($menu_hook) ) {
</del><ins>+
+                        if ( 
+                                ( 
+                                        'index.php' != $item[2] &amp;&amp; 
+                                        file_exists( WP_PLUGIN_DIR . &quot;/$menu_file&quot; ) 
+                                ) || 
+                                ! empty($menu_hook) 
+                        ) {
+
</ins><span class="cx">                                 $admin_is_parent = true;
</span><del>-                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'snack-menu', 'title' =&gt; $item[0], 'href' =&gt; admin_url(&quot;admin.php?page={$item[2]}&quot;) ) );
</del><ins>+                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'snack-menu', 'title' =&gt; $item[0], 'href' =&gt; admin_url(&quot;admin.php?page={$item[2]}&quot;), ) );
</ins><span class="cx">                         } else {
</span><del>-                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'snack-menu', 'title' =&gt; $item[0], 'href' =&gt; admin_url(&quot;{$item[2]}&quot;) ) );
</del><ins>+                                $wp_admin_bar-&gt;add_menu( array(  'parent' =&gt; 'snack-menu', 'title' =&gt; $item[0], 'href' =&gt; admin_url(&quot;{$item[2]}&quot;), ) );
</ins><span class="cx">                         }
</span><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                if ( !empty($submenu[$item[2]]) ) {
</del><ins>+                if ( ! empty($submenu[$item[2]]) ) {
</ins><span class="cx">                         $first = true;
</span><span class="cx">                         $unique_submenu = array();
</span><span class="cx">                         
</span><span class="lines">@@ -113,21 +128,32 @@
</span><span class="cx">                                 
</span><span class="cx">                                 $menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
</span><span class="cx">                                 $sub_file = $sub_item[2];
</span><ins>+
</ins><span class="cx">                                 if ( false !== $pos = strpos($sub_file, '?') )
</span><span class="cx">                                         $sub_file = substr($sub_file, 0, $pos);
</span><span class="cx">                                 
</span><del>-                                if ( ( ('index.php' != $sub_item[2]) &amp;&amp; file_exists(WP_PLUGIN_DIR . &quot;/$sub_file&quot;) ) || ! empty($menu_hook) ) {
</del><ins>+                                if (
+                                        ( 
+                                                'index.php' != $sub_item[2] &amp;&amp; 
+                                                file_exists( WP_PLUGIN_DIR . &quot;/$sub_file&quot; ) 
+                                        ) || 
+                                        ! empty($menu_hook) 
+                                ) {
</ins><span class="cx">                                         // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
</span><del>-                                
-                                        $parent_exists = (!$admin_is_parent &amp;&amp; file_exists(WP_PLUGIN_DIR . &quot;/$menu_file&quot;) &amp;&amp; !is_dir(WP_PLUGIN_DIR . &quot;/{$item[2]}&quot;) ) || file_exists($menu_file);
-                                        if ( $parent_exists )
-                                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; sanitize_title( $item[0] ), 'title' =&gt; $sub_item[0], 'href' =&gt; admin_url(&quot;{$item[2]}?page={$sub_item[2]}&quot;) ) );
-                                        elseif ( 'admin.php' == $pagenow || !$parent_exists )
-                                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; sanitize_title( $item[0] ), 'title' =&gt; $sub_item[0], 'href' =&gt; admin_url(&quot;admin.php?page={$sub_item[2]}&quot;) ) );
-                                        else
-                                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; sanitize_title( $item[0] ), 'title' =&gt; $sub_item[0], 'href' =&gt; admin_url(&quot;{$item[2]}?page={$sub_item[2]}&quot;) ) );
</del><ins>+                                        if (
+                                                ( 
+                                                        ! $admin_is_parent &amp;&amp; 
+                                                        file_exists(WP_PLUGIN_DIR . &quot;/$menu_file&quot;) &amp;&amp; 
+                                                        ! is_dir(WP_PLUGIN_DIR . &quot;/{$item[2]}&quot;)
+                                                ) || 
+                                                file_exists( $menu_file ) 
+                                        ) {
+                                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; sanitize_title( $item[0] ), 'title' =&gt; $sub_item[0], 'href' =&gt; admin_url(&quot;{$item[2]}?page={$sub_item[2]}&quot;), ) );
+                                        } else {
+                                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; sanitize_title( $item[0] ), 'title' =&gt; $sub_item[0], 'href' =&gt; admin_url(&quot;admin.php?page={$sub_item[2]}&quot;), ) );
+                                        }
</ins><span class="cx">                                 } else {
</span><del>-                                        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; sanitize_title( $item[0] ), 'title' =&gt; $sub_item[0], 'href' =&gt; admin_url(&quot;{$sub_item[2]}&quot;) ) );
</del><ins>+                                        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; sanitize_title( $item[0] ), 'title' =&gt; $sub_item[0], 'href' =&gt; admin_url(&quot;{$sub_item[2]}&quot;), ) );
</ins><span class="cx">                                 }
</span><span class="cx">                         }
</span><span class="cx">                 }
</span><span class="lines">@@ -153,4 +179,4 @@
</span><span class="cx">         return (object) $stats;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-?&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+?&gt;
</ins></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (16037 => 16038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php        2010-10-28 08:31:16 UTC (rev 16037)
+++ trunk/wp-includes/admin-bar.php        2010-10-28 08:31:36 UTC (rev 16038)
</span><span class="lines">@@ -6,45 +6,31 @@
</span><span class="cx">  */
</span><span class="cx">  
</span><span class="cx"> /**
</span><del>- * Instantiate the admin bar class and set it up as a global for access elsewhere.
</del><ins>+ * Instantiate the admin bar object and set it up as a global for access elsewhere.
+ *
+ * @since 3.1.0
+ * @return bool Whether the admin bar was successfully initialized.
</ins><span class="cx">  */
</span><span class="cx"> function wp_admin_bar_init() {
</span><del>-        global $current_user, $pagenow, $wp_admin_bar;
</del><ins>+        global $wp_admin_bar;
</ins><span class="cx"> 
</span><del>-        if ( ! show_admin_bar() )
</del><ins>+        if ( ! is_admin_bar_showing() )
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><del>-        /* Set the protocol constant used throughout this code */
-        if ( !defined( 'PROTO' ) )
-                if ( is_ssl() ) define( 'PROTO', 'https://' ); else define( 'PROTO', 'http://' );
-
-        /* Don't load the admin bar if the user is not logged in */
-        if ( !is_user_logged_in() )
-                return false;
-
-        /* Set up the settings we need to render menu items */
-        if ( !is_object( $current_user ) )
-                $current_user = wp_get_current_user();
-
-        /* Enqueue the JS files for the admin bar. */
-        wp_enqueue_script( 'jquery', false, false, false, true );
-
</del><span class="cx">         /* Load the admin bar class code ready for instantiation */
</span><span class="cx">         require( ABSPATH . WPINC . '/admin-bar/admin-bar-class.php' );
</span><span class="cx"> 
</span><del>-        /* Only load super admin menu code if the logged in user is a super admin */
-        if ( is_super_admin() ) {
-                require( ABSPATH . WPINC . '/admin-bar/admin-bar-debug.php' );
-                require( ABSPATH . WPINC . '/admin-bar/admin-bar-superadmin.php' );
-        }
</del><ins>+        /* Instantiate the admin bar */
+        $admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
+        if ( class_exists( $admin_bar_class ) ) 
+                $wp_admin_bar = new $admin_bar_class;
+        else
+                return false;
+        
+        $wp_admin_bar-&gt;initialize();
+        $wp_admin_bar-&gt;add_menus();
</ins><span class="cx"> 
</span><del>-        /* Initialize the admin bar */
-        $wp_admin_bar = new wp_admin_bar();
-
-        add_action( 'wp_head', 'wp_admin_bar_css' );
-        add_action( 'admin_head', 'wp_admin_bar_css' );
-
-        do_action('admin_bar_init');
</del><ins>+        return true;
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'init', 'wp_admin_bar_init' );
</span><span class="cx"> 
</span><span class="lines">@@ -56,11 +42,13 @@
</span><span class="cx">  * It includes the action &quot;wp_before_admin_bar_render&quot; which should be used to hook in and
</span><span class="cx">  * add new menus to the admin bar. That way you can be sure that you are adding at most optimal point,
</span><span class="cx">  * right before the admin bar is rendered. This also gives you access to the $post global, among others.
</span><ins>+ *
+ * @since 3.1.0
</ins><span class="cx">  */
</span><span class="cx"> function wp_admin_bar_render() {
</span><span class="cx">         global $wp_admin_bar;
</span><span class="cx"> 
</span><del>-        if ( !is_object( $wp_admin_bar ) )
</del><ins>+        if ( ! is_object( $wp_admin_bar ) )
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><span class="cx">         $wp_admin_bar-&gt;load_user_locale_translations();
</span><span class="lines">@@ -78,57 +66,50 @@
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Show the logged in user's gravatar as a separator.
</span><ins>+ *
+ * @since 3.1.0
</ins><span class="cx">  */
</span><span class="cx"> function wp_admin_bar_me_separator() {
</span><del>-        global $wp_admin_bar, $current_user;
-
-        if ( !is_object( $wp_admin_bar ) )
-                return false;
-
-        $wp_admin_bar-&gt;add_menu( array( 'id' =&gt; 'me', 'title' =&gt; get_avatar( $current_user-&gt;ID, 16 ), 'href' =&gt; $wp_admin_bar-&gt;user-&gt;account_domain . 'wp-admin/profile.php' ) );
</del><ins>+        global $wp_admin_bar;
+        $wp_admin_bar-&gt;add_menu( array( 'id' =&gt; 'me', 'title' =&gt; get_avatar( get_current_user_id(), 16 ), 'href' =&gt; admin_url('profile.php'), ) );
</ins><span class="cx"> }
</span><del>-add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_me_separator', 10 );
</del><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Use the $wp_admin_bar global to add the &quot;My Account&quot; menu and all submenus.
</del><ins>+ * Add the &quot;My Account&quot; menu and all submenus.
+ *
+ * @since 3.1.0
</ins><span class="cx">  */
</span><span class="cx"> function wp_admin_bar_my_account_menu() {
</span><del>-        global $wp_admin_bar, $current_user;
</del><ins>+        global $wp_admin_bar;
</ins><span class="cx"> 
</span><del>-        if ( !is_object( $wp_admin_bar ) )
-                return false;
-
</del><span class="cx">         /* Add the 'My Account' menu */
</span><del>-        $wp_admin_bar-&gt;add_menu( array( 'id' =&gt; 'my-account', 'title' =&gt; __( 'My Account' ), 'href' =&gt; admin_url('profile.php') ) );
</del><ins>+        $wp_admin_bar-&gt;add_menu( array( 'id' =&gt; 'my-account', 'title' =&gt; __( 'My Account' ),  'href' =&gt; admin_url('profile.php'), ) );
</ins><span class="cx"> 
</span><span class="cx">         /* Add the &quot;My Account&quot; sub menus */
</span><del>-        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-account', 'title' =&gt; __( 'Edit My Profile' ), 'href' =&gt; admin_url('profile.php') ) );
-        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-account', 'title' =&gt; __( 'Global Dashboard' ), 'href' =&gt; admin_url() ) );
-        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-account', 'title' =&gt; __( 'Log Out' ), 'href' =&gt; wp_logout_url() ) );
</del><ins>+        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-account', 'title' =&gt; __( 'Edit My Profile' ), 'href' =&gt; admin_url('profile.php'), ) );
+        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-account', 'title' =&gt; __( 'Global Dashboard' ), 'href' =&gt; admin_url(), ) );
+        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-account', 'title' =&gt; __( 'Log Out' ), 'href' =&gt; wp_logout_url(), ) );
</ins><span class="cx"> }
</span><del>-add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_account_menu', 20 );
</del><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Use the $wp_admin_bar global to add the &quot;My Sites/[Site Name]&quot; menu and all submenus.
</del><ins>+ * Add the &quot;My Sites/[Site Name]&quot; menu and all submenus.
+ *
+ * @since 3.1.0
</ins><span class="cx">  */
</span><span class="cx"> function wp_admin_bar_my_blogs_menu() {
</span><span class="cx">         global $wpdb, $wp_admin_bar;
</span><span class="cx"> 
</span><del>-        if ( !is_object( $wp_admin_bar ) )
-                return false;
-
</del><span class="cx">         /* Add the 'My Dashboards' menu if the user has more than one site. */
</span><span class="cx">         if ( count( $wp_admin_bar-&gt;user-&gt;blogs ) &gt; 1 ) {
</span><del>-                $wp_admin_bar-&gt;add_menu( array( 'id' =&gt; 'my-blogs', 'title' =&gt; __( 'My Sites' ), 'href' =&gt; $wp_admin_bar-&gt;user-&gt;account_domain ) );
</del><ins>+                $wp_admin_bar-&gt;add_menu( array(  'id' =&gt; 'my-blogs', 'title' =&gt; __( 'My Sites' ),  'href' =&gt; $wp_admin_bar-&gt;user-&gt;account_domain, ) );
</ins><span class="cx"> 
</span><span class="cx">                 $default = includes_url('images/wpmini-blue.png');
</span><span class="cx"> 
</span><del>-                $counter = 2;
</del><span class="cx">                 foreach ( (array) $wp_admin_bar-&gt;user-&gt;blogs as $blog ) {
</span><span class="cx">                         $blogdomain = preg_replace( '!^https?://!', '', $blog-&gt;siteurl );
</span><span class="cx">                         // @todo Replace with some favicon lookup.
</span><span class="cx">                         //$blavatar = '&lt;img src=&quot;' . esc_url( blavatar_url( blavatar_domain( $blog-&gt;siteurl ), 'img', 16, $default ) ) . '&quot; alt=&quot;Blavatar&quot; width=&quot;16&quot; height=&quot;16&quot; /&gt;';
</span><del>-                        $blavatar = '&lt;img src=&quot;' . esc_url($default) . '&quot; alt=&quot;Blavatar&quot; width=&quot;16&quot; height=&quot;16&quot; /&gt;';;
</del><ins>+                        $blavatar = '&lt;img src=&quot;' . esc_url($default) . '&quot; alt=&quot;' . esc_attr__( 'Blavatar' ) . '&quot; width=&quot;16&quot; height=&quot;16&quot; /&gt;';
</ins><span class="cx"> 
</span><span class="cx">                         $marker = '';
</span><span class="cx">                         if ( strlen($blog-&gt;blogname) &gt; 35 )
</span><span class="lines">@@ -139,205 +120,183 @@
</span><span class="cx">                         else
</span><span class="cx">                                 $blogname = substr( $blog-&gt;blogname, 0, 35 ) . $marker;
</span><span class="cx"> 
</span><del>-                        if ( !isset( $blog-&gt;visible ) || $blog-&gt;visible === true ) {
-                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-blogs', 'id' =&gt; 'blog-' . $blog-&gt;userblog_id, 'title' =&gt; $blavatar . $blogname, 'href' =&gt; constant( 'PROTO' ) . $blogdomain . '/wp-admin/' ) );
-                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'blog-' . $blog-&gt;userblog_id, 'id' =&gt; 'blog-' . $blog-&gt;userblog_id . '-d', 'title' =&gt; __( 'Dashboard' ), 'href' =&gt; constant( 'PROTO' ) . $blogdomain . '/wp-admin/' ) );
-                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'blog-' . $blog-&gt;userblog_id, 'id' =&gt; 'blog-' . $blog-&gt;userblog_id . '-n', 'title' =&gt; __( 'New Post' ), 'href' =&gt; constant( 'PROTO' ) . $blogdomain . '/wp-admin/post-new.php' ) );
</del><ins>+                        if ( ! isset( $blog-&gt;visible ) || $blog-&gt;visible === true ) {
+                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-blogs', 'id' =&gt; 'blog-' . $blog-&gt;userblog_id, 'title' =&gt; $blavatar . $blogname,  'href' =&gt; $wp_admin_bar-&gt;proto . $blogdomain . '/wp-admin/', ) );
+                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'blog-' . $blog-&gt;userblog_id, 'id' =&gt; 'blog-' . $blog-&gt;userblog_id . '-d', 'title' =&gt; __( 'Dashboard' ), 'href' =&gt; $wp_admin_bar-&gt;proto . $blogdomain . '/wp-admin/', ) );
+                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'blog-' . $blog-&gt;userblog_id, 'id' =&gt; 'blog-' . $blog-&gt;userblog_id . '-n', 'title' =&gt; __( 'New Post' ), 'href' =&gt; $wp_admin_bar-&gt;proto . $blogdomain . '/wp-admin/post-new.php', ) );
+
</ins><span class="cx">                                 // @todo, stats plugins should add this:
</span><del>-                                //$wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'blog-' . $blog-&gt;userblog_id, 'id' =&gt; 'blog-' . $blog-&gt;userblog_id . '-s', 'title' =&gt; __( 'Site Stats' ), 'href' =&gt; constant( 'PROTO' ) . $blogdomain . '/wp-admin/index.php?page=stats' ) );
-                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'blog-' . $blog-&gt;userblog_id, 'id' =&gt; 'blog-' . $blog-&gt;userblog_id . '-c', 'title' =&gt; __( 'Manage Comments' ), 'href' =&gt; constant( 'PROTO' ) . $blogdomain . '/wp-admin/edit-comments.php' ) );
-                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'blog-' . $blog-&gt;userblog_id, 'id' =&gt; 'blog-' . $blog-&gt;userblog_id . '-v', 'title' =&gt; __( 'Read Site' ), 'href' =&gt; constant( 'PROTO' ) . $blogdomain ) );
</del><ins>+                                //$wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'blog-' . $blog-&gt;userblog_id, 'id' =&gt; 'blog-' . $blog-&gt;userblog_id . '-s', 'title' =&gt; __( 'Site Stats' ), 'href' =&gt; $wp_admin_bar-&gt;proto . $blogdomain . '/wp-admin/index.php?page=stats' ) );
+                                
+                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'blog-' . $blog-&gt;userblog_id, 'id' =&gt; 'blog-' . $blog-&gt;userblog_id . '-c', 'title' =&gt; __( 'Manage Comments' ), 'href' =&gt; $wp_admin_bar-&gt;proto . $blogdomain . '/wp-admin/edit-comments.php', ) );
+                                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'blog-' . $blog-&gt;userblog_id, 'id' =&gt; 'blog-' . $blog-&gt;userblog_id . '-v', 'title' =&gt; __( 'Read Site' ), 'href' =&gt; $wp_admin_bar-&gt;proto . $blogdomain, ) );
</ins><span class="cx">                         }
</span><del>-                        $counter++;
</del><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 /* Add the &quot;Manage Sites&quot; menu item */
</span><span class="cx">                 // @todo, use dashboard site.
</span><del>-                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-blogs', 'id' =&gt; 'manage-blogs', 'title' =&gt; __( 'Manage Sites' ), admin_url('my-sites.php') ) );
</del><ins>+                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-blogs', 'id' =&gt; 'manage-blogs', 'title' =&gt; __( 'Manage Sites' ), admin_url('my-sites.php'), ) );
</ins><span class="cx"> 
</span><span class="cx">         /* Add the 'My Dashboard' menu if the user only has one site. */
</span><span class="cx">         } else {
</span><del>-                $wp_admin_bar-&gt;add_menu( array( 'id' =&gt; 'my-blogs', 'title' =&gt; __( 'My Site' ), 'href' =&gt; $wp_admin_bar-&gt;user-&gt;account_domain ) );
</del><ins>+                $wp_admin_bar-&gt;add_menu( array( 'id' =&gt; 'my-blogs', 'title' =&gt; __( 'My Site' ), 'href' =&gt; $wp_admin_bar-&gt;user-&gt;account_domain, ) );
+                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-blogs', 'id' =&gt; 'blog-1-d', 'title' =&gt; __( 'Dashboard' ), 'href' =&gt; admin_url(),) );
+                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-blogs', 'id' =&gt; 'blog-1-n', 'title' =&gt; __( 'New Post' ), 'href' =&gt; admin_url('post-new.php'),) );
</ins><span class="cx"> 
</span><del>-                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-blogs', 'id' =&gt; 'blog-1-d', 'title' =&gt; __( 'Dashboard' ), 'href' =&gt; admin_url() ) );
-                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-blogs', 'id' =&gt; 'blog-1-n', 'title' =&gt; __( 'New Post' ), 'href' =&gt; admin_url('post-new.php') ) );
</del><span class="cx">                 // @todo Stats plugins should add this.
</span><span class="cx">                 //$wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-blogs', 'id' =&gt; 'blog-1-s', 'title' =&gt; __( 'Site Stats' ), 'href' =&gt; admin_ur;('index.php?page=stats') ) );
</span><del>-                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-blogs', 'id' =&gt; 'blog-1-c', 'title' =&gt; __( 'Manage Comments' ), 'href' =&gt; admin_url('edit-comments.php') ) );
-                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-blogs', 'id' =&gt; 'blog-1-v', 'title' =&gt; __( 'Read Site' ), 'href' =&gt; home_url() ) );
</del><ins>+
+                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-blogs', 'id' =&gt; 'blog-1-c','title' =&gt; __( 'Manage Comments' ), 'href' =&gt; admin_url('edit-comments.php'), ) );
+                $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'my-blogs', 'id' =&gt; 'blog-1-v', 'title' =&gt; __( 'Read Site' ), 'href' =&gt; home_url(),) );
</ins><span class="cx">         }
</span><span class="cx"> }
</span><del>-add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_blogs_menu', 30 );
</del><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Show the blavatar of the current site as a separator.
</span><ins>+ *
+ * @since 3.1.0
</ins><span class="cx">  */
</span><span class="cx"> function wp_admin_bar_blog_separator() {
</span><del>-        global $wp_admin_bar, $current_user, $current_blog;
-
-        if ( !is_object( $wp_admin_bar ) )
-                return false;
-
</del><ins>+        global $wp_admin_bar, $current_blog;
</ins><span class="cx">         $default = includes_url('images/wpmini-blue.png');
</span><del>-
-        $wp_admin_bar-&gt;add_menu( array( 'id' =&gt; 'blog', 'title' =&gt; '&lt;img class=&quot;avatar&quot; src=&quot;' . $default . '&quot; alt=&quot;' . __( 'Current site avatar' ) . '&quot; width=&quot;16&quot; height=&quot;16&quot; /&gt;', 'href' =&gt; home_url() ) );
</del><ins>+        $wp_admin_bar-&gt;add_menu( array( 'id' =&gt; 'blog', 'title' =&gt; '&lt;img class=&quot;avatar&quot; src=&quot;' . $default . '&quot; alt=&quot;' . esc_attr__( 'Current site avatar' ) . '&quot; width=&quot;16&quot; height=&quot;16&quot; /&gt;',  'href' =&gt; home_url(), ) );
</ins><span class="cx"> }
</span><del>-add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_blog_separator', 40 );
</del><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Use the $wp_admin_bar global to add a menu for site info, accessable to all users.
</del><ins>+ * Site info menu
+ * 
+ * @since 3.1.0
</ins><span class="cx">  */
</span><span class="cx"> function wp_admin_bar_bloginfo_menu() {
</span><span class="cx">         global $wp_admin_bar;
</span><span class="cx"> 
</span><del>-        if ( !is_object( $wp_admin_bar ) )
-                return false;
-
</del><span class="cx">         /* Add the Site Info menu */
</span><del>-        $wp_admin_bar-&gt;add_menu( array( 'id' =&gt; 'bloginfo', 'title' =&gt; __( 'Site Info' ), 'href' =&gt; '' ) );
</del><ins>+        $wp_admin_bar-&gt;add_menu( array( 'id' =&gt; 'bloginfo', 'title' =&gt; __( 'Site Info' ), 'href' =&gt; '', ) );
</ins><span class="cx"> 
</span><del>-        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'bloginfo', 'title' =&gt; __( 'Get Shortlink' ), 'href' =&gt; '', 'meta' =&gt; array( 'onclick' =&gt; 'javascript:function wpcomshort() { var url=document.location;var links=document.getElementsByTagName(&amp;#39;link&amp;#39;);var found=0;for(var i = 0, l; l = links[i]; i++){if(l.getAttribute(&amp;#39;rel&amp;#39;)==&amp;#39;shortlink&amp;#39;) {found=l.getAttribute(&amp;#39;href&amp;#39;);break;}}if (!found) {for (var i = 0; l = document.links[i]; i++) {if (l.getAttribute(&amp;#39;rel&amp;#39;) == &amp;#39;shortlink&amp;#39;) {found = l.getAttribute(&amp;#39;href&amp;#39;);break;}}}if (found) {prompt(&amp;#39;URL:&amp;#39;, found);} else {alert(&amp;#39;No shortlink available for this page&amp;#39;); } } wpcomshort(); return false;' ) ) );
</del><ins>+        // TODO: Move this js out into a seperate file?
+        $wp_admin_bar-&gt;add_menu( array( 'parent' =&gt; 'bloginfo', 'title' =&gt; __( 'Get Shortlink' ), 'href' =&gt; '', 'meta' =&gt; array( 
+                        'onclick' =&gt; 'javascript:function wpcomshort() { var url=document.location;var links=document.getElementsByTagName(&amp;#39;link&amp;#39;);var found=0;for(var i = 0, l; l = links[i]; i++){if(l.getAttribute(&amp;#39;rel&amp;#39;)==&amp;#39;shortlink&amp;#39;) {found=l.getAttribute(&amp;#39;href&amp;#39;);break;}}if (!found) {for (var i = 0; l = document.links[i]; i++) {if (l.getAttribute(&amp;#39;rel&amp;#39;) == &amp;#39;shortlink&amp;#39;) {found = l.getAttribute(&amp;#39;href&amp;#39;);break;}}}if (found) {prompt(&amp;#39;' . esc_js( __( 'URL:' ) ) . '&amp;#39;, found);} else {alert(&amp;#39;' . esc_js( __( 'No shortlink available for this page.' ) ) . '&amp;#39;); } } wpcomshort(); return false;' ) ) );
</ins><span class="cx"> }
</span><del>-add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_bloginfo_menu', 50 );
</del><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Use the $wp_admin_bar global to add the &quot;Edit Post&quot; menu when viewing a single post.
</del><ins>+ * Provide an edit link for posts and terms.
+ * 
+ * @since 3.1.0
</ins><span class="cx">  */
</span><span class="cx"> function wp_admin_bar_edit_menu() {
</span><del>-        global $post, $wp_admin_bar;
</del><ins>+        global $wp_admin_bar, $wp_query;
</ins><span class="cx"> 
</span><del>-        if ( !is_object( $wp_admin_bar ) )
-                return false;
</del><ins>+        $current_object = $wp_query-&gt;get_queried_object();
</ins><span class="cx"> 
</span><del>-        if ( !is_single() &amp;&amp; !is_page() )
</del><ins>+        if ( empty( $current_object ) ) 
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><del>-        if ( !$post_type_object = get_post_type_object( $post-&gt;post_type ) )
-                return false;
-
-        if ( !current_user_can( $post_type_object-&gt;cap-&gt;edit_post, $post-&gt;ID ) )
-                return false;
-
-        $wp_admin_bar-&gt;add_menu( array( 'id' =&gt; 'edit', 'title' =&gt; __( 'Edit' ), 'href' =&gt; get_edit_post_link( $post-&gt;ID ) ) );
</del><ins>+        if ( ! empty( $current_object-&gt;post_type ) &amp;&amp; ( $post_type_object = get_post_type_object( $current_object-&gt;post_type ) ) &amp;&amp; current_user_can( $post_type_object-&gt;cap-&gt;edit_post, $current_object-&gt;ID ) ) {
+                $wp_admin_bar-&gt;add_menu( array( 'id' =&gt; 'edit', 'title' =&gt; __( 'Edit' ),  'href' =&gt; get_edit_post_link( $current_object-&gt;ID ), ) );
+        } elseif ( ! empty( $current_object-&gt;taxonomy ) &amp;&amp;  ( $tax = get_taxonomy( $current_object-&gt;taxonomy ) ) &amp;&amp; current_user_can( $tax-&gt;cap-&gt;edit_terms ) ) {
+                $wp_admin_bar-&gt;add_menu( array( 'id' =&gt; 'edit', 'title' =&gt; __( 'Edit' ), 'href' =&gt; get_edit_term_link( $current_object-&gt;term_id, $current_object-&gt;taxonomy ), ) );
+        }
</ins><span class="cx"> }
</span><del>-add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_edit_menu', 100 );
</del><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Load up the CSS needed to render the admin bar nice and pretty.
</del><ins>+ * Style and scripts for the admin bar.
+ *
+ * @since 3.1.0
+ * @todo move js into a admin-bar js file
+ *
</ins><span class="cx">  */
</span><del>-function wp_admin_bar_css() {
-        global $pagenow, $wp_locale, $wp_admin_bar;
-
-        if ( !is_object( $wp_admin_bar ) )
-                return false;
-
-        if ( !is_user_logged_in() )
-                return;
-
-        $nobump = false;
-
-        /* Wish we could use wp_enqueue_style() here, but it will not let us pass GET params to the stylesheet correctly. */
</del><ins>+function wp_admin_bar_header() {
</ins><span class="cx">         ?&gt;
</span><del>-        &lt;link rel=&quot;stylesheet&quot; href=&quot;&lt;?php echo includes_url('admin-bar/admin-bar-css.php') . '?t=' . get_current_theme() . '&amp;amp;a=' . is_admin() . '&amp;amp;p=' . is_ssl() . '&amp;amp;sa=' . is_super_admin() . '&amp;amp;td=' . $wp_locale-&gt;text_direction . '&amp;amp;inc=' . includes_url() . '&amp;amp;nobump=' . $nobump; ?&gt;&quot; type=&quot;text/css&quot; /&gt;
-        &lt;!--[if IE 6]&gt;&lt;style type=&quot;text/css&quot;&gt;#wpadminbar, #wpadminbar .menupop a span, #wpadminbar .menupop ul li a:hover, #wpadminbar .myaccount a, .quicklinks a:hover,#wpadminbar .menupop:hover { background-image: none !important; } #wpadminbar .myaccount a { margin-left:0 !important; padding-left:12px !important;}&lt;/style&gt;&lt;![endif]--&gt;
-        &lt;style type=&quot;text/css&quot; media=&quot;print&quot;&gt;#wpadminbar { display:none; }&lt;/style&gt;&lt;?php
-}
</del><ins>+        &lt;style type=&quot;text/css&quot; media=&quot;print&quot;&gt;#wpadminbar { display:none; }&lt;/style&gt;
+        &lt;script type=&quot;text/javascript&quot;&gt;
+        /*        &lt;![CDATA[ */
+        (function(d, w) {
+                var init = function() {
+                        var b = d.getElementsByTagName('body')[0],
+                        aB = d.getElementById('wpadminbar'),
+                        s = d.getElementById('adminbar-search');
</ins><span class="cx"> 
</span><del>-/**
- * Load up the JS needed to allow the admin bar to function correctly.
- */
-function wp_admin_bar_js() {
-        global $wp_admin_bar;
</del><ins>+                        if ( b &amp;&amp; aB )
+                                b.appendChild( aB );
</ins><span class="cx"> 
</span><del>-        if ( !is_object( $wp_admin_bar ) )
-                return false;
</del><ins>+                        if ( s ) {
+                                if ( '' == s.value )
+                                        s.value = s.getAttribute('title');
</ins><span class="cx"> 
</span><del>-        ?&gt;
-        &lt;script type=&quot;text/javascript&quot;&gt;
-/*        &lt;![CDATA[ */
-                function pressthis(step) {if (step == 1) {if(navigator.userAgent.indexOf('Safari') &gt;= 0) {Q=getSelection();}else {if(window.getSelection)Q=window.getSelection().toString();else if(document.selection)Q=document.selection.createRange().text;else Q=document.getSelection().toString();}} else {location.href='&lt;?php echo $wp_admin_bar-&gt;user-&gt;account_domain; ?&gt;wp-admin/post-new.php?text='+encodeURIComponent(Q.toString())+'&amp;amp;popupurl='+encodeURIComponent(location.href)+'&amp;amp;popuptitle='+encodeURIComponent(document.title);}}
-                function toggle_query_list() { var querylist = document.getElementById( 'querylist' );if( querylist.style.display == 'block' ) {querylist.style.display='none';} else {querylist.style.display='block';}}
</del><ins>+                                s.onblur = function() {
+                                        this.value = '' == this.value ? this.getAttribute('title') : this.value;
+                                }
+                                s.onfocus = function() {
+                                        this.value = this.getAttribute('title') == this.value ? '' : this.value;
+                                }
+                        }
+                        
+                        if ( w.location.hash )
+                                w.scrollBy(0,-32);
+                }
</ins><span class="cx"> 
</span><del>-                jQuery( function() {
-                        (function(jq){jq.fn.hoverIntent=function(f,g){var cfg={sensitivity:7,interval:100,timeout:0};cfg=jq.extend(cfg,g?{over:f,out:g}:f);var cX,cY,pX,pY;var track=function(ev){cX=ev.pageX;cY=ev.pageY;};var compare=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);if((Math.abs(pX-cX)+Math.abs(pY-cY))&lt;cfg.sensitivity){jq(ob).unbind(&quot;mousemove&quot;,track);ob.hoverIntent_s=1;return cfg.over.apply(ob,[ev]);}else{pX=cX;pY=cY;ob.hoverIntent_t=setTimeout(function(){compare(ev,ob);},cfg.interval);}};var delay=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);ob.hoverIntent_s=0;return cfg.out.apply(ob,[ev]);};var handleHover=function(e){var p=(e.type==&quot;mouseover&quot;?e.fromElement:e.toElement)||e.relatedTarget;while(p&amp;&amp;p!=this){try{p=p.parentNode;}catch(e){p=this;}}if(p==this){return false;}var ev=jQuery.extend({},e);var ob=this;if(ob.hoverIntent_t){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);}if(e.type==&quot;mouseover&quot;){pX=ev.pageX;pY=ev.pageY;jq(ob).bind(&quot;mousemove&quot;,track);if(ob.hoverIntent_s!=1){ob.hoverIntent_t=setTimeout(function(){compare(ev,ob);},cfg.interval);}}else{jq(ob).unbind(&quot;mousemove&quot;,track);if(ob.hoverIntent_s==1){ob.hoverIntent_t=setTimeout(function(){delay(ev,ob);},cfg.timeout);}}};return this.mouseover(handleHover).mouseout(handleHover);};})(jQuery);
-                        (function(jq){jq.fn.superfish=function(op){var sf=jq.fn.superfish,c=sf.c,jqarrow=jq([''].join('')),over=function(){var jqjq=jq(this),menu=getMenu(jqjq);clearTimeout(menu.sfTimer);jqjq.showSuperfishUl().siblings().hideSuperfishUl();},out=function(){var jqjq=jq(this),menu=getMenu(jqjq),o=sf.op;clearTimeout(menu.sfTimer);menu.sfTimer=setTimeout(function(){o.retainPath=(jq.inArray(jqjq[0],o.jqpath)&gt;-1);jqjq.hideSuperfishUl();if(o.jqpath.length&amp;&amp;jqjq.parents(['li.',o.hoverClass].join('')).length&lt;1){over.call(o.jqpath);}},o.delay);},getMenu=function(jqmenu){var menu=jqmenu.parents(['ul.',c.menuClass,':first'].join(''))[0];sf.op=sf.o[menu.serial];return menu;},addArrow=function(jqa){jqa.addClass(c.anchorClass).append(jqarrow.clone());};return this.each(function(){var s=this.serial=sf.o.length;var o=jq.extend({},sf.defaults,op);o.jqpath=jq('li.'+o.pathClass,this).slice(0,o.pathLevels).each(function(){jq(this).addClass([o.hoverClass,c.bcClass].join(' ')).filter('li:has(ul)').removeClass(o.pathClass);});sf.o[s]=sf.op=o;jq('li:has(ul)',this)[(jq.fn.hoverIntent&amp;&amp;!o.disableHI)?'hoverIntent':'hover'](over,out).each(function(){if(o.autoArrows)addArrow(jq('&gt;a:first-child',this));}).not('.'+c.bcClass).hideSuperfishUl();var jqa=jq('a',this);jqa.each(function(i){var jqli=jqa.eq(i).parents('li');jqa.eq(i).focus(function(){over.call(jqli);}).blur(function(){out.call(jqli);});});o.onInit.call(this);}).each(function(){var menuClasses=[c.menuClass];if(sf.op.dropShadows&amp;&amp;!(jq.browser.msie&amp;&amp;jq.browser.version&lt;7))menuClasses.push(c.shadowClass);jq(this).addClass(menuClasses.join(' '));});};var sf=jq.fn.superfish;sf.o=[];sf.op={};sf.IE7fix=function(){var o=sf.op;if(jq.browser.msie&amp;&amp;jq.browser.version&gt;6&amp;&amp;o.dropShadows&amp;&amp;o.animation.opacity!=undefined) this.toggleClass(sf.c.shadowClass+'-off');};sf.c={bcClass:'sf-breadcrumb',menuClass:'sf-js-enabled',anchorClass:'sf-with-ul',arrowClass:'sf-sub-indicator',shadowClass:'sf-shadow'};sf.defaults={hoverClass:'sfHover',pathClass:'overideThisToUse',pathLevels:1,delay:600,animation:{opacity:'show'},speed:100,autoArrows:false,dropShadows:false,disableHI:false,onInit:function(){},onBeforeShow:function(){},onShow:function(){},onHide:function(){}};jq.fn.extend({hideSuperfishUl:function(){var o=sf.op,not=(o.retainPath===true)?o.jqpath:'';o.retainPath=false;var jqul=jq(['li.',o.hoverClass].join(''),this).add(this).not(not).removeClass(o.hoverClass).find('&gt;ul').hide().css('visibility','hidden');o.onHide.call(jqul);return this;},showSuperfishUl:function(){var o=sf.op,sh=sf.c.shadowClass+'-off',jqul=this.addClass(o.hoverClass).find('&gt;ul:hidden').css('visibility','visible');sf.IE7fix.call(jqul);o.onBeforeShow.call(jqul);jqul.animate(o.animation,o.speed,function(){sf.IE7fix.call(jqul);o.onShow.call(jqul);});return this;}});})(jQuery);
</del><ins>+                if ( w.addEventListener )
+                        w.addEventListener('load', init, false);
+                else if ( w.attachEvent ) 
+                        w.attachEvent('onload', init);
</ins><span class="cx"> 
</span><del>-                        &lt;?php if ( is_single() ) : ?&gt;
-                        if ( jQuery(this).width() &lt; 1100 ) jQuery(&quot;#adminbarsearch&quot;).hide();
-                        &lt;?php endif; ?&gt;
-                                
-                        jQuery( '#wpadminbar li.ab-my-account, #wpadminbar li.ab-bloginfo' ).mouseover( function() {
-                                if ( jQuery(this).hasClass( 'ab-my-account' ) ) jQuery('#wpadminbar li.ab-me &gt; a').addClass('hover');
-                                if ( jQuery(this).hasClass( 'ab-bloginfo' ) ) jQuery('#wpadminbar li.ab-blog &gt; a').addClass('hover');
-                        });
-                        
-                        jQuery( '#wpadminbar li.ab-my-account, #wpadminbar li.ab-bloginfo' ).mouseout( function() {
-                                if ( jQuery(this).hasClass( 'ab-my-account' ) ) jQuery('#wpadminbar li.ab-me &gt; a').removeClass('hover');
-                                if ( jQuery(this).hasClass( 'ab-bloginfo' ) ) jQuery('#wpadminbar li.ab-blog &gt; a').removeClass('hover');
-                        });
</del><ins>+        })(document, window);
+        /*        ]]&gt; */
+        &lt;/script&gt;
+        &lt;?php
+}
</ins><span class="cx"> 
</span><del>-                        &lt;?php if ( is_single() ) : ?&gt;
-                        jQuery(window).resize( function() {
-                                if ( jQuery(this).width() &lt; 1100 )
-                                        jQuery(&quot;#adminbarsearch&quot;).hide();
-                                
-                                if ( jQuery(this).width() &gt; 1100 )
-                                        jQuery(&quot;#adminbarsearch&quot;).show();
-                        });
-                        &lt;?php endif; ?&gt;
-                        
-                        jQuery( '#wpadminbar ul ul li a' ).mouseover( function() {
-                                var root = jQuery(this).parents('div.quicklinks ul &gt; li');
-                                var par = jQuery(this).parent();
-                                var children = par.children('ul');
-                                if ( root.hasClass('ab-sadmin') )
-                                        jQuery(children[0]).css('&lt;?php echo( is_rtl() ? 'left' : 'right' ); ?&gt;',par.parents('ul').width() - 1 +'px' );
-                                else
-                                        jQuery(children[0]).css('&lt;?php echo( is_rtl() ? 'right' : 'left' ); ?&gt;',par.parents('ul').width() +'px' );
-                                
-                                jQuery(children[0]).css('top', '0' );
-                        });
-                        
-                        &lt;?php if ( is_user_logged_in() ) : // Hash links scroll 32px back so admin bar doesn't cover. ?&gt;
-                                if ( window.location.hash ) window.scrollBy(0,-32);
-                        &lt;?php endif; ?&gt;
</del><ins>+// @TODO do we still need this in core?
+function wp_admin_body_style() {
+        ?&gt;
+        &lt;style type=&quot;text/css&quot;&gt;
+                &lt;?php 
</ins><span class="cx">                 
</span><del>-                });
</del><ins>+                if ( 
+                        ( empty( $_GET['nobump'] ) || is_admin() ) &amp;&amp; 
+                        ! strpos( $_SERVER['REQUEST_URI'], 'media-upload.php' ) 
+                ) : 
+                        ?&gt;
+                        body { padding-top: 28px !important; }
+                        &lt;?php 
+                endif; 
</ins><span class="cx"> 
</span><del>-                jQuery( function() { 
-                        jQuery('#wpadminbar').appendTo('body'); 
-                        jQuery(&quot;#wpadminbar ul&quot;).superfish();
-                });
</del><ins>+                if ( in_array( get_current_theme(), array('H3', 'H4', 'The Journalist v1.9') ) ) :
+                        ?&gt;
+                        body { padding-top: 28px; background-position: 0px 28px; }
+                        &lt;?php
+                endif;
</ins><span class="cx"> 
</span><del>-                /*        ]]&gt; */
-        &lt;/script&gt;&lt;?php
</del><ins>+                ?&gt;
+        &lt;/style&gt;
+        &lt;?php
</ins><span class="cx"> }
</span><del>-add_action( 'wp_footer', 'wp_admin_bar_js' );
-add_action( 'admin_footer', 'wp_admin_bar_js' );
</del><span class="cx"> 
</span><ins>+add_action('wp_head', 'wp_admin_body_style');
+add_action('admin_head', 'wp_admin_body_style');
+
</ins><span class="cx"> /**
</span><del>- * Return a rendered admin bar via AJAX for use on pages that do not run inside the
- * WP environment. Used on bbPress forum pages to show the admin bar.
</del><ins>+ * Determine whether the admin bar should be showing.
+ *
+ * @since 3.1.0
+ *
+ * @return bool Whether the admin bar should be showing.
</ins><span class="cx">  */
</span><del>-function wp_admin_bar_ajax_render() {
-        global $wp_admin_bar;
</del><ins>+function is_admin_bar_showing() {
+        global $show_admin_bar;
</ins><span class="cx"> 
</span><del>-        wp_admin_bar_js();
-        wp_admin_bar_css();
-        wp_admin_bar_render();
-        die;
-}
-add_action( 'wp_ajax_admin_bar_render', 'wp_admin_bar_ajax_render' );
</del><ins>+        if ( ! isset( $show_admin_bar ) || null === $show_admin_bar ) {
+                $show_admin_bar = true;
</ins><span class="cx"> 
</span><del>-function is_admin_bar() {
-        return ( 0 === strpos($_SERVER['REQUEST_URI'], '/js/admin-bar') );
-}
</del><ins>+                if ( defined('WP_SHOW_ADMIN_BAR') )
+                        $show_admin_bar = (bool) WP_SHOW_ADMIN_BAR;
</ins><span class="cx"> 
</span><del>-function wp_admin_bar_lang($locale) {
-        if ( is_admin_bar() )
-                $locale = get_locale();
-        return $locale;
-}
-add_filter('locale', 'wp_admin_bar_lang');
</del><ins>+                if ( ! is_user_logged_in() )
+                        $show_admin_bar = false;
+        }
</ins><span class="cx"> 
</span><del>-?&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+        $show_admin_bar = apply_filters( 'show_admin_bar', $show_admin_bar );
+
+        return $show_admin_bar;
+}
+?&gt;
</ins></span></pre></div>
<a id="trunkwpincludescssadminbarrtlcss"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/css/admin-bar-rtl.css (0 => 16038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/admin-bar-rtl.css                                (rev 0)
+++ trunk/wp-includes/css/admin-bar-rtl.css        2010-10-28 08:31:36 UTC (rev 16038)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+#wpadminbar{background:#666 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x;direction:rtl;font-family:Tahoma,Arial,sans-serif;right:0;left:auto;}#wpadminbar div,#wpadminbar ul,#wpadminbar ul li{min-height:0;}#wpadminbar ul li img{margin-left:8px!important;margin-right:0!important;}#wpadminbar .quicklinks&gt;ul&gt;li&gt;a{border-left:1px solid #686868;border-right:1px solid #808080;}#wpadminbar .quicklinks&gt;ul&gt;li:last-child&gt;a{border-left:none;border-right:1px solid #808080;}#wpadminbar .quicklinks&gt;ul&gt;li.hover&gt;a{border-right-color:#707070;border-left-color:#686868;}#wpadminbar .avatar{margin:-3px 0 0 5px!important;float:none;}#wpadminbar .menupop li:hover&gt;ul{margin-left:-100%;}#wpadminbar .menupop a&gt;span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 100.4% no-repeat;padding-left:.8em;}#wpadminbar .menupop ul li a&gt;span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 97.2% no-repeat;padding-right:0;padding-left:1.5em;}#wpadminbar .menupop ul{right:0;width:100%;min-width:150px;}#wpadminbar .ab-my-account ul{width:200px;}#wpadminbar .ab-my-blogs ul{width:300px;}#wpadminbar .ab-my-blogs ul ul{width:200px;}#wpadminbar .ab-bloginfo ul{width:200px;}#wpadminbar .ab-subscribe ul{width:150px;}#wpadminbar .menupop ul li{width:auto;}#wpadminbar .quicklinks a{font-family:Tahoma,Arial,Helvetica,sans-serif;}#wpadminbar li.ab-sadmin{float:left;}#wpadminbar li.ab-sadmin ul{right:auto;left:0;float:left;}#wpadminbar li.ab-sadmin&gt;a{border-right:1px solid #666!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul a{border-right:none!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul li{left:0;right:auto;float:left;text-align:right;}#wpadminbar li.ab-sadmin ul li a{padding-right:1.75em;padding-left:0;}#wpadminbar li.ab-sadmin ul li a&gt;span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 100% 101.8% no-repeat;padding-right:1.25em!important;padding-left:0!important;margin-right:-1.25em;margin-left:0;}#wpadminbar li:hover{background:#555 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -282px repeat-x;}#wpadminbar li li:hover{background:#888 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x!important;}.quicklinks ul{text-align:right;}.quicklinks ul li{float:right;}#adminbarsearch{display:none;}#adminbarsearch label,#adminbarsearch a{float:right;}#wpadminbar li.ab-me&gt;a,#wpadminbar li.ab-blog&gt;a{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 59.8% no-repeat;padding:0 .7em 0 1.15em;}#wpadminbar li.ab-me&gt;a.hover,#wpadminbar li.ab-blog&gt;a.hover{background-position:33% 59.8%;}#wpadminbar li.ab-my-account a,#wpadminbar li.ab-bloginfo a{border-right:none!important;padding-right:.7em!important;}#wpadminbar li.ab-my-account&gt;ul,#wpadminbar li.ab-bloginfo&gt;ul{right:-7px;left:auto;}#wpadminbar ul li a strong.count{margin-right:5px;margin-left:0;position:static;}.adminbar-input{background:#ddd url(../images/admin-bar-sprite-rtl.png?d=08102010) right top no-repeat!important;float:right!important;font-family:Tahoma,Arial,Helvetica,sans-serif!important;margin-right:3px!important;margin-left:0!important;}button.adminbar-button{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) left -107px no-repeat;float:right;padding:0 0 0 14px;}button.adminbar-button span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) right -69px no-repeat;padding:3px 14px 0 0;font-family:Tahoma,Arial,Helvetica,sans-serif!important;}button.adminbar-button:active{background-position:left -184px!important;}button.adminbar-button:active span{background-position:right -146px!important;}#querylist{direction:ltr;}#wpadminbar #admin-bar-micro ul li:hover&gt;ul{left:auto;right:100%;}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludescssadminbarrtldevcss"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/css/admin-bar-rtl.dev.css (0 => 16038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/admin-bar-rtl.dev.css                                (rev 0)
+++ trunk/wp-includes/css/admin-bar-rtl.dev.css        2010-10-28 08:31:36 UTC (rev 16038)
</span><span class="lines">@@ -0,0 +1,221 @@
</span><ins>+#wpadminbar {
+        background:#666 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x;
+        direction:rtl;
+        font-family: Tahoma, Arial ,sans-serif;
+        right:0;
+        left:auto;
+}
+#wpadminbar div, 
+#wpadminbar ul,
+#wpadminbar ul li {
+        min-height: 0;
+}
+#wpadminbar ul li img {
+        margin-left: 8px !important;
+        margin-right: 0 !important;
+}
+
+#wpadminbar .quicklinks &gt; ul &gt; li &gt; a {
+        border-left: 1px solid #686868;
+        border-right: 1px solid #808080;
+}
+
+#wpadminbar .quicklinks &gt; ul &gt; li:last-child &gt; a {
+        border-left: none;
+        border-right: 1px solid #808080;
+}
+
+#wpadminbar .quicklinks &gt; ul &gt; li.hover &gt; a {
+        border-right-color: #707070;
+        border-left-color: #686868;
+}
+
+#wpadminbar .avatar {
+        margin: -3px  0 0 5px !important;
+        float:none;
+}
+
+#wpadminbar .menupop li:hover &gt; ul {
+        margin-left:-100%;
+}
+
+#wpadminbar .menupop a &gt; span {
+        background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 100.4% no-repeat;
+        padding-left:.8em;
+}
+
+#wpadminbar .menupop ul li a &gt; span {
+        background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0% 97.2% no-repeat;
+        padding-right:0;
+        padding-left:1.5em;
+}
+
+#wpadminbar .menupop ul {
+        right: 0;
+        width:100%;
+        min-width:150px;
+}
+
+#wpadminbar .ab-my-account ul {
+        width:200px;
+}
+
+#wpadminbar .ab-my-blogs ul {
+        width:300px;
+}
+
+#wpadminbar .ab-my-blogs ul ul {
+        width:200px;
+}
+
+#wpadminbar .ab-bloginfo ul {
+        width:200px;
+}
+
+#wpadminbar .ab-subscribe ul {
+        width:150px;
+}
+
+#wpadminbar .menupop ul li {
+        width:auto;
+}
+
+#wpadminbar .quicklinks a {
+        font-family: Tahoma, Arial, Helvetica, sans-serif;
+}
+
+#wpadminbar li.ab-sadmin {
+        float: left;
+}
+
+#wpadminbar li.ab-sadmin ul {
+        right: auto;
+        left: 0;
+        float: left;
+}
+
+#wpadminbar li.ab-sadmin &gt; a {
+        border-right: 1px solid #666 !important;
+        border-left:none !important;
+}
+
+
+#wpadminbar li.ab-sadmin ul a {
+        border-right: none !important;
+        border-left: none !important;
+}
+
+#wpadminbar li.ab-sadmin ul li {
+        left: 0;
+        right:auto;
+        float: left;
+        text-align: right;
+}
+
+#wpadminbar li.ab-sadmin ul li a {
+        padding-right: 1.75em;
+        padding-left: 0;
+}

+#wpadminbar li.ab-sadmin ul li a &gt; span {
+        background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 100% 101.8% no-repeat;
+        padding-right: 1.25em !important;
+        padding-left: 0 !important;
+        margin-right: -1.25em;
+        margin-left: 0;
+}
+
+#wpadminbar li:hover {
+        background: #555 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -282px repeat-x;
+}
+#wpadminbar li li:hover {
+        background: #888 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x !important;
+}
+
+.quicklinks ul {
+        text-align:right;
+}
+
+.quicklinks ul li {
+        float:right;
+}
+
+#adminbarsearch {
+        display:none;
+}
+
+#adminbarsearch label, 
+#adminbarsearch a {
+        float:right;
+}
+
+
+#wpadminbar li.ab-me &gt; a, 
+#wpadminbar li.ab-blog &gt; a {
+        background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0% 59.8% no-repeat;
+        padding: 0 0.7em 0 1.15em;
+}
+
+#wpadminbar li.ab-me &gt; a.hover, 
+#wpadminbar li.ab-blog &gt; a.hover {
+        background-position: 33% 59.8%;
+}
+
+#wpadminbar li.ab-my-account a,
+#wpadminbar li.ab-bloginfo a {
+        border-right: none !important;
+        padding-right: 0.7em !important;
+}
+
+#wpadminbar li.ab-my-account &gt; ul,
+#wpadminbar li.ab-bloginfo &gt; ul {
+        right: -7px;
+        left:auto;
+}
+
+
+#wpadminbar ul li a strong.count {
+        margin-right: 5px;
+        margin-left: 0;
+        position:static;
+}
+
+.adminbar-input {
+        background:#ddd url(../images/admin-bar-sprite-rtl.png?d=08102010) right top no-repeat !important;
+        float:right !important;
+        font-family: Tahoma, Arial,Helvetica,sans-serif !important;
+        margin-right:3px !important;
+        margin-left:0 !important;
+}
+button.adminbar-button {
+        background:url(../images/admin-bar-sprite-rtl.png?d=08102010) left -107px no-repeat;
+        float:right;
+        padding:0 0 0 14px;
+}
+button.adminbar-button span {
+        background:url(../images/admin-bar-sprite-rtl.png?d=08102010) right -69px no-repeat;
+        padding:3px 14px 0 0;
+        font-family: Tahoma, Arial,Helvetica,sans-serif !important;
+}
+button.adminbar-button:active {
+        background-position:left -184px !important;
+}
+button.adminbar-button:active span {
+        background-position:right -146px !important;
+}
+
+/**
+ * Super admin styling
+ */
+#querylist {
+        direction: ltr;
+}
+
+#wpadminbar #admin-bar-micro ul li:hover &gt; ul {
+        left: auto;
+        right: 100%;
+}
+
+/**
+* End super admin styling
+*/
</ins></span></pre></div>
<a id="trunkwpincludescssadminbarcss"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/css/admin-bar.css (0 => 16038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/admin-bar.css                                (rev 0)
+++ trunk/wp-includes/css/admin-bar.css        2010-10-28 08:31:36 UTC (rev 16038)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+#wpadminbar{direction:ltr;background:#666 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x;color:#ddd;font:12px Arial,Helvetica,sans-serif;height:28px;left:0;margin:0;position:fixed;top:0;width:100%;z-index:99999;min-width:960px;}#wpadminbar ul,#wpadminbar ul li{position:relative;z-index:99999;}#wpadminbar ul li img{vertical-align:middle!important;margin-right:8px!important;border:none!important;padding:0!important;}#wpadminbar .quicklinks&gt;ul&gt;li&gt;a{border-right:1px solid #686868;border-left:1px solid #808080;}#wpadminbar .quicklinks&gt;ul&gt;li:last-child&gt;a{border-right:none;}#wpadminbar .quicklinks&gt;ul&gt;li:hover&gt;a,#wpadminbar .quicklinks&gt;ul&gt;li.hover&gt;a{border-left-color:#707070;}#wpadminbar a{outline:none;}#wpadminbar .avatar{border:1px solid #999!important;padding:0!important;margin:-3px 5px 0 0!important;vertical-align:middle;float:none;display:inline!important;}#wpadminbar li:hover&gt;ul{display:block;}#wpadminbar .menupop li:hover&gt;ul{margin-left:100%;margin-top:-28px;}#wpadminbar .menupop ul li a{color:#555!important;text-shadow:none;font-weight:normal;white-space:nowrap;}#wpadminbar .menupop a&gt;span{background:url(../images/admin-bar-sprite.png?d=08102010) 100% 100.4% no-repeat;padding-right:.8em;line-height:28px;}#wpadminbar .menupop ul li a&gt;span{display:block;background:url(../images/admin-bar-sprite.png?d=08102010) 100% 97.2% no-repeat;padding-right:1.5em;line-height:28px;}#wpadminbar .menupop ul li a span#awaiting-mod{display:inline;background:#aaa;color:#fff;padding:1px 5px;font-size:10px;font-family:verdana;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;}#wpadminbar .menupop ul li a:hover span#awaiting-mod{background:#fff;color:#888;}#wpadminbar .menupop ul{-moz-box-shadow:0 4px 8px rgba(0,0,0,0.1);-webkit-box-shadow:0 4px 8px rgba(0,0,0,0.1);background:#fff;display:none;position:absolute;border:1px solid #dfdfdf;border-top:none!important;float:none;}html&gt;body #wpadminbar .menupop ul{background:rgba(255,255,255,0.97);border-color:rgba(0,0,0,0.1);}#wpadminbar .menupop.ab-my-account ul,#wpadminbar .menupop.ab-my-dash ul,#wpadminbar .menupop.ab-new-post ul{min-width:140px;}#wpadminbar .menupop li{float:none;margin:0;padding:0;background-image:none;}#wpadminbar .quicklinks a{border:none;color:#ddd!important;height:28px;text-shadow:#555 0 -1px 0;display:block;font:13px Arial,Helvetica,sans-serif;font-weight:normal;letter-spacing:normal;padding:0 .85em;line-height:28px;text-decoration:none!important;}#wpadminbar .quicklinks a:hover{text-shadow:#333 0 -1px 0;}#wpadminbar li.ab-sadmin{float:right;background:#555;}#wpadminbar li.ab-sadmin ul{right:0;float:right;}#wpadminbar li.ab-sadmin&gt;a{font-size:11px!important;padding:0 7px!important;border:none!important;border-left:1px solid #666!important;}#wpadminbar li.ab-sadmin ul a{border-right:none!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul li{right:0;float:right;text-align:left;width:100%;}#wpadminbar li.ab-sadmin ul li a{padding-left:1.75em;}#wpadminbar li.ab-sadmin ul li a&gt;span{background:url(../images/admin-bar-sprite.png?d=08102010) 0 101.8% no-repeat;padding-left:1.25em;margin-left:-1.25em;line-height:28px;padding-right:0!important;}#wpadminbar li:hover{background:#555 url(../images/admin-bar-sprite.png?d=08102010) 0 -282px repeat-x;}#wpadminbar li li:hover{color:#fff!important;background:#888 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x!important;text-shadow:#666 0 -1px 0;}#wpadminbar li li:hover&gt;a{color:#fff!important;}.quicklinks ul{list-style:none;margin:0;padding:0;text-align:left;}.quicklinks ul li{float:left;margin:0;}#adminbarsearch{float:right;}#adminbarsearch{height:18px;padding:3px;}#adminbarsearch *{color:#555;font-size:12px;}#adminbarsearch label,#adminbarsearch a{height:28px;color:#ccc;display:block;float:left;padding:3px 4px;text-shadow:0 -1px 0 #444;}#adminbarsearch a{text-decoration:underline;}#adminbarsearch a:hover{color:#fff;}#wpadminbar li.ab-me:hover,#wpadminbar li.ab-blog:hover{background:none;}#wpadminbar li.ab-me&gt;a,#wpadminbar li.ab-blog&gt;a{line-height:18px!important;border:none!important;background:url(../images/admin-bar-sprite.png?d=08102010) 100% 59.8% no-repeat;height:28px;padding:0 1.15em 0 .7em;}#wpadminbar li.ab-me&gt;a:hover,#wpadminbar li.ab-me&gt;a.hover,#wpadminbar li.ab-blog&gt;a:hover,#wpadminbar li.ab-blog&gt;a.hover{background-position:67% 59.8%;}#wpadminbar li.ab-me img.avatar,#wpadminbar li.ab-blog img.avatar{margin:4px 0 0 0!important;vertical-align:middle;background:#eee;width:16px!important;height:16px!important;}#wpadminbar li.ab-my-account a,#wpadminbar li.ab-bloginfo a{border-left:none!important;padding-left:.7em!important;margin-top:0!important;}#wpadminbar li.ab-my-account&gt;ul,#wpadminbar li.ab-bloginfo&gt;ul{left:-7px;}#wpadminbar ul li img{width:16px!important;height:16px!important;}#wpadminbar ul li a strong.count{text-shadow:none;background:#ddd;color:#555;margin-left:5px;padding:1px 6px;top:-1px;position:relative;font-size:9px;-moz-border-radius:7px;-webkit-border-radius:7px;border-radius:7px;font-weight:normal;}#wpadminbar #adminbar-search{line-height:normal!important;width:140px!important;margin-top:0!important;}.adminbar-input{display:block!important;float:left!important;font:12px Arial,Helvetica,sans-serif!important;border:1px solid #626262!important;padding:2px 3px!important;margin-right:3px!important;background:#ddd url(../images/admin-bar-sprite.png?d=08102010) top left no-repeat!important;-webkit-border-radius:0!important;-khtml-border-radius:0!important;-moz-border-radius:0!important;border-radius:0!important;outline:none;text-shadow:0 1px 0 #fff;}button.adminbar-button{position:relative;border:0;cursor:pointer;overflow:visible;margin:0!important;float:left;background:url(../images/admin-bar-sprite.png?d=08102010) right -107px no-repeat;padding:0 14px 0 0;text-align:center;}button.adminbar-button span{position:relative;display:block;white-space:nowrap;height:19px;background:url(../images/admin-bar-sprite.png?d=08102010) left -69px no-repeat;padding:3px 0 0 14px;font:12px Arial,Helvetica,sans-serif!important;font-weight:bold!important;color:#444!important;text-shadow:0 1px 0 #eee!important;}button.adminbar-button:active{background-position:right -184px!important;text-shadow:0 1px 0 #eee!important;}button.adminbar-button:hover span{color:#000!important;}button.adminbar-button:active span{background-position:left -146px!important;}button.adminbar-button::-moz-focus-inner{border:none;}@media screen and(-webkit-min-device-pixel-ratio:0){button.adminbar-button span{margin-top:-1px;}}* html #wpadminbar,* html #wpadminbar .menupop a span,* html #wpadminbar .menupop ul li a:hover,* html #wpadminbar .myaccount a,* html .quicklinks a:hover,#wpadminbar .menupop:hover{background-image:none!important;}* html #wpadminbar{overflow:hidden;position:absolute;}* html #wpadminbar .quicklinks ul li a{float:left;}* html #adminbarsearch-wrap{position:absolute;top:0;}* html #wpadminbar ul,* html #wpadminbar ul li{zoom:1;}* html #wpadminbar .myaccount a{margin-left:0!important;padding-left:12px!important;}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludescssadminbardevcss"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/css/admin-bar.dev.css (0 => 16038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/admin-bar.dev.css                                (rev 0)
+++ trunk/wp-includes/css/admin-bar.dev.css        2010-10-28 08:31:36 UTC (rev 16038)
</span><span class="lines">@@ -0,0 +1,370 @@
</span><ins>+#wpadminbar {
+        direction:ltr;
+        background:#666 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x;
+        color:#ddd;
+        font:12px Arial, Helvetica, sans-serif;
+        height:28px;
+        left:0;
+        margin:0;
+        position:fixed;
+        top:0;
+        width:100%;
+        z-index:99999;
+        min-width: 960px;
+}
+#wpadminbar ul, 
+#wpadminbar ul li {
+        position: relative;
+        z-index: 99999;
+}
+#wpadminbar ul li img {
+        vertical-align: middle !important;
+        margin-right: 8px !important;
+        border: none !important;
+        padding: 0 !important;
+}
+#wpadminbar .quicklinks &gt; ul &gt; li &gt; a {
+        border-right: 1px solid #686868;
+        border-left: 1px solid #808080;
+}
+#wpadminbar .quicklinks &gt; ul &gt; li:last-child &gt; a {
+        border-right: none;
+}
+#wpadminbar .quicklinks &gt; ul &gt; li:hover &gt; a,
+#wpadminbar .quicklinks &gt; ul &gt; li.hover &gt; a {
+        border-left-color: #707070;
+}
+#wpadminbar a {
+        outline: none;
+}
+#wpadminbar .avatar {
+        border:1px solid #999 !important;
+        padding:0 !important;
+        margin:-3px 5px 0 0 !important;
+        vertical-align:middle;
+        float:none;
+        display:inline !important;
+}
+#wpadminbar li:hover &gt; ul {
+        display:block;
+}
+
+#wpadminbar .menupop li:hover &gt; ul {
+        margin-left:100%;
+        margin-top:-28px;
+}
+
+#wpadminbar .menupop ul li a {
+        color:#555 !important;
+        text-shadow:none;
+        font-weight:normal;
+        white-space:nowrap;
+}
+#wpadminbar .menupop a &gt; span {
+        background:url(../images/admin-bar-sprite.png?d=08102010) 100% 100.4% no-repeat;
+        padding-right:.8em;
+        line-height: 28px;
+}
+#wpadminbar .menupop ul li a &gt; span {
+        display: block;
+        background:url(../images/admin-bar-sprite.png?d=08102010) 100% 97.2% no-repeat;
+        padding-right:1.5em;
+        line-height: 28px;
+}
+#wpadminbar .menupop ul li a span#awaiting-mod {
+        display: inline;
+        background: #aaa;
+        color: #fff;
+        padding: 1px 5px;
+        font-size: 10px;
+        font-family: verdana;
+        -moz-border-radius: 5px;
+        -webkit-border-radius: 5px;
+        border-radius: 5px;
+}
+#wpadminbar .menupop ul li a:hover span#awaiting-mod {
+        background: #fff;
+        color: #888;
+}
+#wpadminbar .menupop ul {
+        -moz-box-shadow:0 4px 8px rgba(0,0,0,0.1);
+        -webkit-box-shadow:0 4px 8px rgba(0,0,0,0.1);
+        background:#fff;
+        display:none;
+        position:absolute;
+        border:1px solid #dfdfdf;
+        border-top:none !important;
+        float:none;
+}
+html&gt;body #wpadminbar .menupop ul {
+        background:rgba(255,255,255,0.97);
+        border-color:rgba(0,0,0,0.1);
+}
+#wpadminbar .menupop.ab-my-account ul, 
+#wpadminbar .menupop.ab-my-dash ul,
+#wpadminbar .menupop.ab-new-post ul {
+        min-width:140px;
+}
+#wpadminbar .menupop li {
+        float:none;
+        margin:0;
+        padding:0;
+        background-image:none;
+}
+#wpadminbar .quicklinks a {
+        border:none;
+        color:#ddd !important;
+        height:28px;
+        text-shadow:#555 0px -1px 0px;
+        display:block;
+        font:13px Arial, Helvetica, sans-serif;
+        font-weight:normal;
+        letter-spacing:normal;
+        padding:0 0.85em;
+        line-height:28px;
+        text-decoration:none !important;
+}
+#wpadminbar .quicklinks a:hover {
+        text-shadow:#333 0px -1px 0px;
+}
+
+#wpadminbar li.ab-sadmin {
+        float: right;
+        background: #555;
+}
+#wpadminbar li.ab-sadmin ul {
+        right: 0;
+        float: right;
+}
+#wpadminbar li.ab-sadmin &gt; a {
+        font-size: 11px !important;
+        padding: 0 7px !important;
+        border: none !important;
+        border-left: 1px solid #666 !important;
+}
+
+#wpadminbar li.ab-sadmin ul a {
+        border-right: none !important;
+        border-left: none !important;
+}
+#wpadminbar li.ab-sadmin ul li {
+        right: 0;
+        float: right;
+        text-align: left;
+        width: 100%;
+}
+#wpadminbar li.ab-sadmin ul li a {
+        padding-left: 1.75em;
+} 
+#wpadminbar li.ab-sadmin ul li a &gt; span {
+        background:url(../images/admin-bar-sprite.png?d=08102010) 0% 101.8% no-repeat;
+        padding-left: 1.25em;
+        margin-left: -1.25em;
+        line-height: 28px;
+        padding-right: 0 !important;
+}
+
+#wpadminbar li:hover {
+        background: #555 url(../images/admin-bar-sprite.png?d=08102010) 0 -282px repeat-x;
+}
+#wpadminbar li li:hover {
+        color:#fff !important;
+        background: #888 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x !important;
+        text-shadow: #666 0px -1px 0px;
+}
+#wpadminbar li li:hover &gt; a {
+        color:#fff !important;
+}
+.quicklinks ul {
+        list-style:none;
+        margin:0;
+        padding:0;
+        text-align:left;
+}
+.quicklinks ul li {
+        float:left;
+        margin:0;
+}
+
+#adminbarsearch {
+        float:right;
+}
+#adminbarsearch {
+        height: 18px;
+        padding: 3px;
+}
+#adminbarsearch * {
+        color: #555;
+        font-size:12px;
+}
+#adminbarsearch label, 
+#adminbarsearch a {
+        height: 28px;
+        color: #ccc;
+        display:block;
+        float:left;
+        padding:3px 4px;
+        text-shadow:0px -1px 0px #444;
+}
+#adminbarsearch a {
+        text-decoration:underline;
+}
+#adminbarsearch a:hover {
+        color:#fff;
+}
+
+#wpadminbar li.ab-me:hover, 
+#wpadminbar li.ab-blog:hover {
+        background:none;
+}
+#wpadminbar li.ab-me &gt; a, 
+#wpadminbar li.ab-blog &gt; a {
+        line-height: 18px !important;
+        border: none !important;
+        background:url(../images/admin-bar-sprite.png?d=08102010) 100% 59.8% no-repeat;
+        height: 28px;
+        padding: 0 1.15em 0 0.7em;
+}
+#wpadminbar li.ab-me &gt; a:hover, 
+#wpadminbar li.ab-me &gt; a.hover, 
+#wpadminbar li.ab-blog &gt; a:hover,
+#wpadminbar li.ab-blog &gt; a.hover {
+        background-position: 67% 59.8%;
+}
+#wpadminbar li.ab-me img.avatar, 
+#wpadminbar li.ab-blog img.avatar {
+        margin: 4px 0 0 0 !important;
+        vertical-align: middle;
+        background: #eee;
+        width: 16px !important;
+        height: 16px !important;
+}
+#wpadminbar li.ab-my-account a, #wpadminbar li.ab-bloginfo a {
+        border-left: none !important;
+        padding-left: 0.7em !important;
+        margin-top: 0 !important;
+}
+#wpadminbar li.ab-my-account &gt; ul, #wpadminbar li.ab-bloginfo &gt; ul {
+        left: -7px;
+}
+#wpadminbar ul li img {
+        width: 16px !important;
+        height: 16px !important;
+}
+
+#wpadminbar ul li a strong.count {
+        text-shadow: none;
+        background: #ddd;
+        color: #555;
+        margin-left: 5px;
+        padding: 1px 6px;
+        top: -1px;
+        position: relative;
+        font-size: 9px;
+        -moz-border-radius: 7px;
+        -webkit-border-radius: 7px;
+        border-radius: 7px;
+        font-weight: normal;
+}
+
+#wpadminbar #adminbar-search {
+        line-height:normal !important;
+        width:140px !important;
+        margin-top:0px !important;
+}
+.adminbar-input {
+        display:block !important;
+        float:left !important;
+        font:12px Arial,Helvetica,sans-serif !important;
+        border:1px solid #626262 !important;
+        padding:2px 3px !important;
+        margin-right:3px !important;
+        background:#ddd url(../images/admin-bar-sprite.png?d=08102010) top left no-repeat !important;
+        -webkit-border-radius:0 !important;
+        -khtml-border-radius:0 !important;
+        -moz-border-radius:0 !important;
+        border-radius:0 !important;
+        outline:none;
+        text-shadow:0 1px 0 #fff;
+}
+button.adminbar-button {
+        position:relative;
+        border:0;
+        cursor:pointer;
+        overflow:visible;
+        margin:0 !important;
+        float:left;
+        background:url(../images/admin-bar-sprite.png?d=08102010) right -107px no-repeat;
+        padding:0 14px 0 0;
+        text-align:center;
+}
+button.adminbar-button span {
+        position:relative;
+        display:block;
+        white-space:nowrap;
+        height:19px;
+        background:url(../images/admin-bar-sprite.png?d=08102010) left -69px no-repeat;
+        padding:3px 0 0 14px;
+        font:12px Arial,Helvetica,sans-serif !important;
+        font-weight:bold !important;
+        color:#444 !important;
+        text-shadow:0px 1px 0px #eee !important;
+}
+button.adminbar-button:active {
+        background-position:right -184px !important;
+        text-shadow:0px 1px 0px #eee !important;
+}
+button.adminbar-button:hover span {
+        color:#000 !important;
+}
+button.adminbar-button:active span {
+        background-position:left -146px !important;
+}
+button.adminbar-button::-moz-focus-inner {
+        border:none;
+}
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+        button.adminbar-button span {
+                margin-top: -1px;
+        }
+}
+
+
+/**
+ * IE 6-targeted rules
+ */
+
+* html #wpadminbar, 
+* html #wpadminbar .menupop a span, 
+* html #wpadminbar .menupop ul li a:hover, 
+* html #wpadminbar .myaccount a, 
+* html .quicklinks a:hover,#wpadminbar .menupop:hover { 
+        background-image: none !important; 
+}
+
+* html #wpadminbar {
+        overflow:hidden;
+        position:absolute;
+}
+
+* html #wpadminbar .quicklinks ul li a {
+        float:left;
+}
+
+* html #adminbarsearch-wrap {
+        position:absolute;
+        top:0;
+}
+
+* html #wpadminbar ul, 
+* html #wpadminbar ul li {
+        zoom:1;
+}
+
+* html #wpadminbar .myaccount a { 
+        margin-left:0 !important; 
+        padding-left:12px !important;
+}
+/**
+ * End IE 6-targeted rules
+ */
</ins></span></pre></div>
<a id="trunkwpincludescsssuperadminbarcss"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/css/super-admin-bar.css (0 => 16038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/super-admin-bar.css                                (rev 0)
+++ trunk/wp-includes/css/super-admin-bar.css        2010-10-28 08:31:36 UTC (rev 16038)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+#querylist{font-family:Arial,Tahoma,sans-serif;display:none;position:absolute;top:50px;left:50px;right:50px;background:#fff;padding:20px;-moz-box-shadow:0 0 15px #888;-webkit-box-shadow:0 0 15px #888;box-shadow:0 0 15px #888;z-index:99999;border:10px solid #f0f0f0;color:#000;line-height:150%!important;}#querylist pre{font-size:12px;padding:10px;}#querylist h1{font-family:georgia,times,serif;text-align:center;font-size:24px;padding:20px 5px;background:#eee;color:#555;margin:0;}#querylist div#debug-status{background:#ccc;color:#fff;overflow:hidden;height:21px;font-size:14px;font-family:georgia,times,serif;padding:7px 15px;}#querylist .left{float:left;}#querylist .right{float:right;}#querylist h1,#querylist h2,#querylist h3{font-weight:normal;}#querylist ul.debug-menu-links{clear:left;background:#ccc;padding:10px 15px 0;overflow:hidden;list-style:none;margin:0;padding:0 0 0 15px;}#querylist ul.debug-menu-links li{float:left;margin-right:10px;margin-bottom:0!important;}#querylist ul.debug-menu-links li a{outline:none;display:block;padding:5px 9px;margin-right:0;background:#bbb;color:#fff!important;text-decoration:none!important;font-weight:normal;font-size:12px;color:#555;-webkit-border-top-right-radius:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-topleft:4px;}#querylist ul.debug-menu-links li.current a{background:#fff;color:#555!important;}#querylist h2{float:left;min-width:150px;border:1px solid #eee;padding:5px 10px 15px;clear:none;important;text-align:center;font-family:georgia,times,serif;font-size:28px;margin:15px 10px 15px 0!important;}#querylist h2 span{font-size:12px;color:#888;text-transform:uppercase;white-space:nowrap;display:block;margin-bottom:5px;}#object-cache-stats h2{border:none;float:none;text-align:left;font-size:22px;margin-bottom:0;}#object-cache-stats ul.debug-menu-links{padding:0;margin:0;background:none;}#object-cache-stats ul.debug-menu-links li{float:left;margin-bottom:10px!important;background:none!important;border:1px solid #eee!important;color:#555!important;}#object-cache-stats ul.debug-menu-links li.current a{background:#ccc!important;color:#fff!important;-webkit-border-top-right-radius:0;-webkit-border-top-left-radius:0;-moz-border-radius-topright:0;-moz-border-radius-topleft:0;}#object-cache-stats ul.debug-menu-links li a{background:none;color:#555!important;overflow:hidden;}#querylist h3{margin-bottom:15px;}#querylist ol#wpd-queries{padding:0!important;margin:0!important;list-style:none;clear:left;}#querylist ol#wpd-queries li{padding:10px;background:#f0f0f0;margin:0 0 10px 0;}#querylist ol#wpd-queries li div.qdebug{background:#e8e8e8;margin:10px -10px -10px -10px;padding:5px 150px 5px 5px;font-size:11px;position:relative;min-height:20px;}#querylist ol#wpd-queries li div.qdebug span{position:absolute;right:10px;top:5px;white-space:nowrap;}#querylist a{text-decoration:underline!important;color:blue!important;}#querylist a:hover{text-decoration:none!important;}#querylist .debug-menu-target{display:none;}#querylist ol{font:12px Monaco,&quot;Courier New&quot;,Courier,Fixed!important;line-height:180%!important;}#wpadminbar #admin-bar-micro ul li{list-style-type:none;position:relative;margin:0;padding:0;}#wpadminbar #admin-bar-micro ul ul,#wpadminbar #admin-bar-micro #awaiting-mod,#wpadminbar .ab-sadmin .count-0{display:none!important;}#wpadminbar #admin-bar-micro ul li:hover&gt;ul{display:block;position:absolute;top:-1px;left:100%;}#wpadminbar #admin-bar-micro li a{display:block;text-decoration:none;}#wpadminbar #admin-bar-micro li li a{background:#ddd;}#wpadminbar #admin-bar-micro li li li a{background:#fff;}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludescsssuperadminbardevcss"></a>
<div class="addfile"><h4>Added: trunk/wp-includes/css/super-admin-bar.dev.css (0 => 16038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/super-admin-bar.dev.css                                (rev 0)
+++ trunk/wp-includes/css/super-admin-bar.dev.css        2010-10-28 08:31:36 UTC (rev 16038)
</span><span class="lines">@@ -0,0 +1,222 @@
</span><ins>+/**
+ * Super admin styling
+ */
+#querylist {
+        font-family: Arial, Tahoma, sans-serif;
+        display: none;
+        position: absolute;
+        top: 50px;
+        left: 50px;
+        right: 50px;
+        background: #fff;
+        padding: 20px;
+        -moz-box-shadow: 0 0 15px #888;
+        -webkit-box-shadow: 0 0 15px #888;
+        box-shadow: 0 0 15px #888;
+        z-index: 99999;
+        border: 10px solid #f0f0f0;
+        color: #000;
+        line-height: 150% !important;
+}
+#querylist pre {
+        font-size: 12px;
+        padding: 10px;
+}
+
+#querylist h1 {
+        font-family: georgia, times, serif;
+        text-align: center;
+        font-size: 24px;
+        padding: 20px 5px;
+        background: #eee;
+        color: #555;
+        margin: 0;
+}
+#querylist div#debug-status {
+        background: #ccc;
+        color: #fff;
+        overflow: hidden;
+        height: 21px;
+        font-size: 14px;
+        font-family: georgia, times, serif;
+        padding: 7px 15px;
+}
+#querylist .left {
+        float: left;
+}
+#querylist .right {
+        float: right;
+}
+
+#querylist h1, #querylist h2, #querylist h3 {
+        font-weight: normal;
+}
+
+#querylist ul.debug-menu-links {
+        clear: left;
+        background: #ccc;
+        padding: 10px 15px 0;
+        overflow: hidden;
+        list-style: none;
+        margin: 0;
+        padding: 0 0 0 15px;
+}
+        #querylist ul.debug-menu-links li {
+                float: left;
+                margin-right: 10px;
+                margin-bottom: 0 !important;
+        }
+        
+        #querylist ul.debug-menu-links li a {
+                outline: none;
+                display: block;
+                padding: 5px 9px;
+                margin-right: 0;
+                background: #bbb;
+                color: #fff !important;
+                text-decoration: none !important;
+                font-weight: normal;
+                font-size: 12px;
+                color: #555;
+                -webkit-border-top-right-radius: 4px;
+                -webkit-border-top-left-radius: 4px;
+                -moz-border-radius-topright: 4px;
+                -moz-border-radius-topleft: 4px;
+        }
+                #querylist ul.debug-menu-links li.current a {
+                        background: #fff;
+                        color: #555 !important;
+                }
+
+#querylist h2 {
+        float: left;
+        min-width: 150px;
+        border: 1px solid #eee;
+        padding: 5px 10px 15px;
+        clear: none;
+        important;
+        text-align: center;
+        font-family: georgia, times, serif;
+        font-size: 28px;
+        margin: 15px 10px 15px 0 !important;
+}
+        #querylist h2 span {
+                font-size: 12px;
+                color: #888;
+                text-transform: uppercase;
+                white-space: nowrap;
+                display: block;
+                margin-bottom: 5px;
+        }
+
+#object-cache-stats h2 {
+        border: none;
+        float: none;
+        text-align: left;
+        font-size: 22px;
+        margin-bottom: 0;
+}
+
+#object-cache-stats ul.debug-menu-links {
+        padding: 0;
+        margin: 0;
+        background: none;
+}
+        #object-cache-stats ul.debug-menu-links li {
+                float: left;
+                margin-bottom: 10px !important;
+                background: none !important;
+                border: 1px solid #eee !important;
+                color: #555 !important;
+        }
+                #object-cache-stats ul.debug-menu-links li.current a {
+                        background: #ccc !important;
+                        color: #fff !important;
+                        -webkit-border-top-right-radius: 0;
+                        -webkit-border-top-left-radius: 0;
+                        -moz-border-radius-topright: 0;
+                        -moz-border-radius-topleft: 0;
+                }
+                
+                #object-cache-stats ul.debug-menu-links li a {
+                        background: none;
+                        color: #555 !important;
+                        overflow: hidden;
+                }
+
+#querylist h3 {
+        margin-bottom: 15px;
+}
+
+#querylist ol#wpd-queries {
+        padding: 0 !important;
+        margin: 0 !important;
+        list-style: none;
+        clear: left;
+}
+        #querylist ol#wpd-queries li {
+                padding: 10px;
+                background: #f0f0f0;
+                margin: 0 0 10px 0;
+        }
+                #querylist ol#wpd-queries li div.qdebug {
+                        background: #e8e8e8;
+                        margin: 10px -10px -10px -10px;
+                        padding: 5px 150px 5px 5px;
+                        font-size: 11px;
+                        position: relative;
+                        min-height: 20px;
+                }
+                
+                #querylist ol#wpd-queries li div.qdebug span {
+                        position: absolute;
+                        right: 10px;
+                        top: 5px;
+                        white-space: nowrap;
+                }
+
+#querylist a {
+        text-decoration: underline !important;
+        color: blue !important;
+}
+#querylist a:hover {
+        text-decoration: none !important;
+}
+#querylist .debug-menu-target {
+        display: none;
+}
+
+#querylist ol {
+        font: 12px Monaco, &quot;Courier New&quot;, Courier, Fixed !important;
+        line-height: 180% !important;
+}
+
+#wpadminbar #admin-bar-micro ul li {
+        list-style-type: none;
+        position: relative;
+        margin: 0;
+        padding: 0;
+}
+#wpadminbar #admin-bar-micro ul ul, #wpadminbar #admin-bar-micro #awaiting-mod, #wpadminbar .ab-sadmin .count-0 {
+        display: none !important;
+}
+#wpadminbar #admin-bar-micro ul li:hover &gt; ul {
+        display: block;
+        position: absolute;
+        top: -1px;
+        left: 100%;
+}
+#wpadminbar #admin-bar-micro li a {
+        display: block;
+        text-decoration: none;
+}
+#wpadminbar #admin-bar-micro li li a {
+        background: #ddd;
+}
+#wpadminbar #admin-bar-micro li li li a {
+        background: #fff;
+}
+
+/**
+* End super admin styling
+*/
</ins></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (16037 => 16038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php        2010-10-28 08:31:16 UTC (rev 16037)
+++ trunk/wp-includes/script-loader.php        2010-10-28 08:31:36 UTC (rev 16038)
</span><span class="lines">@@ -456,7 +456,7 @@
</span><span class="cx"> 
</span><span class="cx">         $suffix = defined('SCRIPT_DEBUG') &amp;&amp; SCRIPT_DEBUG ? '.dev' : '';
</span><span class="cx"> 
</span><del>-        $rtl_styles = array( 'wp-admin', 'global', 'colors', 'colors-fresh', 'colors-classic', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'nav-menu', 'farbtastic' );
</del><ins>+        $rtl_styles = array( 'wp-admin', 'global', 'colors', 'colors-fresh', 'colors-classic', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'nav-menu', 'farbtastic', 'admin-bar' );
</ins><span class="cx">         // Any rtl stylesheets that don't have a .dev version for ltr
</span><span class="cx">         $no_suffix = array( 'farbtastic' );
</span><span class="cx"> 
</span><span class="lines">@@ -491,6 +491,10 @@
</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><span class="cx">         $styles-&gt;add( 'nav-menu', &quot;/wp-admin/css/nav-menu$suffix.css&quot;, array(), '20100907' );
</span><ins>+        
+        // Admin bar
+        $styles-&gt;add( 'admin-bar', &quot;/wp-includes/css/admin-bar$suffix.css&quot;, array(), '20101028' );
+        $styles-&gt;add( 'super-admin-bar', &quot;/wp-includes/css/super-admin-bar$suffix.css&quot;, array(), '20101028' );
</ins><span class="cx"> 
</span><span class="cx">         foreach ( $rtl_styles as $rtl_style ) {
</span><span class="cx">                 $styles-&gt;add_data( $rtl_style, 'rtl', true );
</span></span></pre>
</div>
</div>

</body>
</html>