Wordpress 3.5.2
[autoinstalls/wordpress.git] / wp-includes / class-wp-admin-bar.php
index 549d5ecf28eae200a4e6bccabf76b7d265222cf8..1483da2d992f1a0405bf604d7e51e4a69aa55287 100644 (file)
@@ -1,31 +1,45 @@
 <?php
+/**
+ * The WordPress Toolbar
+ *
+ * @since 3.1.0
+ *
+ * @package WordPress
+ * @subpackage Toolbar
+ */
 class WP_Admin_Bar {
-       var $changed_locale = false;
-       var $menu;
-       var $need_to_change_locale = false;
-       var $proto = 'http://';
-       var $user;
-
-       function initialize() {
-               /* Set the protocol used throughout this code */
-               if ( is_ssl() )
-                       $this->proto = 'https://';
+       private $nodes = array();
+       private $bound = false;
+       public $user;
+
+       public function __get( $name ) {
+               switch ( $name ) {
+                       case 'proto' :
+                               return is_ssl() ? 'https://' : 'http://';
+                               break;
+                       case 'menu' :
+                               _deprecated_argument( 'WP_Admin_Bar', '3.3', 'Modify admin bar nodes with WP_Admin_Bar::get_node(), WP_Admin_Bar::add_node(), and WP_Admin_Bar::remove_node(), not the <code>menu</code> property.' );
+                               return array(); // Sorry, folks.
+                               break;
+               }
+       }
 
+       public function initialize() {
                $this->user = new stdClass;
-               $this->menu = new stdClass;
-
-               /* Populate settings we need for the menu based on the current user. */
-               $this->user->blogs = get_blogs_of_user( get_current_user_id() );
-               if ( is_multisite() ) {
-                       $this->user->active_blog = get_active_blog_for_user( get_current_user_id() );
-                       $this->user->domain = empty( $this->user->active_blog ) ? user_admin_url() : trailingslashit( get_home_url( $this->user->active_blog->blog_id ) );
-                       $this->user->account_domain = $this->user->domain;
-               } else {
-                       $this->user->active_blog = $this->user->blogs[get_current_blog_id()];
-                       $this->user->domain = trailingslashit( home_url() );
-                       $this->user->account_domain = $this->user->domain;
+
+               if ( is_user_logged_in() ) {
+                       /* Populate settings we need for the menu based on the current user. */
+                       $this->user->blogs = get_blogs_of_user( get_current_user_id() );
+                       if ( is_multisite() ) {
+                               $this->user->active_blog = get_active_blog_for_user( get_current_user_id() );
+                               $this->user->domain = empty( $this->user->active_blog ) ? user_admin_url() : trailingslashit( get_home_url( $this->user->active_blog->blog_id ) );
+                               $this->user->account_domain = $this->user->domain;
+                       } else {
+                               $this->user->active_blog = $this->user->blogs[get_current_blog_id()];
+                               $this->user->domain = trailingslashit( home_url() );
+                               $this->user->account_domain = $this->user->domain;
+                       }
                }
-               $this->user->locale = get_locale();
 
                add_action( 'wp_head', 'wp_admin_bar_header' );
 
@@ -47,190 +61,432 @@ class WP_Admin_Bar {
                do_action( 'admin_bar_init' );
        }
 
-       function add_menu( $args = array() ) {
+       public function add_menu( $node ) {
+               $this->add_node( $node );
+       }
+
+       public function remove_menu( $id ) {
+               $this->remove_node( $id );
+       }
+
+       /**
+        * Add a node to the menu.
+        *
+        * @param array $args - The arguments for each node.
+        * - id         - string    - The ID of the item.
+        * - title      - string    - The title of the node.
+        * - parent     - string    - The ID of the parent node. Optional.
+        * - href       - string    - The link for the item. Optional.
+        * - group      - boolean   - If the node is a group. Optional. Default false.
+        * - meta       - array     - Meta data including the following keys: html, class, onclick, target, title, tabindex.
+        */
+       public function add_node( $args ) {
+               // Shim for old method signature: add_node( $parent_id, $menu_obj, $args )
+               if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) )
+                       $args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
+
+               if ( is_object( $args ) )
+                       $args = get_object_vars( $args );
+
+               // Ensure we have a valid title.
+               if ( empty( $args['id'] ) ) {
+                       if ( empty( $args['title'] ) )
+                               return;
+
+                       _doing_it_wrong( __METHOD__, __( 'The menu ID should not be empty.' ), '3.3' );
+                       // Deprecated: Generate an ID from the title.
+                       $args['id'] = esc_attr( sanitize_title( trim( $args['title'] ) ) );
+               }
+
                $defaults = array(
-                       'title' => false,
-                       'href' => false,
-                       'parent' => false, // false for a root menu, pass the ID value for a submenu of that menu.
-                       'id' => false, // defaults to a sanitized title value.
-                       'meta' => false // array of any of the following options: array( 'html' => '', 'class' => '', 'onclick' => '', target => '', title => '' );
+                       'id'     => false,
+                       'title'  => false,
+                       'parent' => false,
+                       'href'   => false,
+                       'group'  => false,
+                       'meta'   => array(),
                );
 
-               $r = wp_parse_args( $args, $defaults );
-               extract( $r, EXTR_SKIP );
+               // If the node already exists, keep any data that isn't provided.
+               if ( $maybe_defaults = $this->get_node( $args['id'] ) )
+                       $defaults = get_object_vars( $maybe_defaults );
 
-               if ( empty( $title ) )
-                       return false;
+               // Do the same for 'meta' items.
+               if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) )
+                       $args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
 
-               /* Make sure we have a valid ID */
-               if ( empty( $id ) )
-                       $id = esc_attr( sanitize_title( trim( $title ) ) );
+               $args = wp_parse_args( $args, $defaults );
+
+               $back_compat_parents = array(
+                       'my-account-with-avatar' => array( 'my-account', '3.3' ),
+                       'my-blogs'               => array( 'my-sites',   '3.3' ),
+               );
+
+               if ( isset( $back_compat_parents[ $args['parent'] ] ) ) {
+                       list( $new_parent, $version ) = $back_compat_parents[ $args['parent'] ];
+                       _deprecated_argument( __METHOD__, $version, sprintf( 'Use <code>%s</code> as the parent for the <code>%s</code> admin bar node instead of <code>%s</code>.', $new_parent, $args['id'], $args['parent'] ) );
+                       $args['parent'] = $new_parent;
+               }
 
-               if ( ! empty( $parent ) ) {
-                       /* Add the menu to the parent item */
-                       $child = array( 'id' => $id, 'title' => $title, 'href' => $href );
+               $this->_set_node( $args );
+       }
 
-                       if ( ! empty( $meta ) )
-                               $child['meta'] = $meta;
+       final protected function _set_node( $args ) {
+               $this->nodes[ $args['id'] ] = (object) $args;
+       }
+
+       /**
+        * Gets a node.
+        *
+        * @return object Node.
+        */
+       final public function get_node( $id ) {
+               if ( $node = $this->_get_node( $id ) )
+                       return clone $node;
+       }
+
+       final protected function _get_node( $id ) {
+               if ( $this->bound )
+                       return;
+
+               if ( empty( $id ) )
+                       $id = 'root';
+
+               if ( isset( $this->nodes[ $id ] ) )
+                       return $this->nodes[ $id ];
+       }
 
-                       $this->add_node( $parent, $this->menu, $child );
-               } else {
-                       /* Add the menu item */
-                       $this->menu->{$id} = array( 'title' => $title, 'href' => $href );
+       final public function get_nodes() {
+               if ( ! $nodes = $this->_get_nodes() )
+                       return;
 
-                       if ( ! empty( $meta ) )
-                               $this->menu->{$id}['meta'] = $meta;
+               foreach ( $nodes as &$node ) {
+                       $node = clone $node;
                }
+               return $nodes;
        }
 
-       function remove_menu( $id ) {
-               return $this->remove_node( $id, $this->menu );
+       final protected function _get_nodes() {
+               if ( $this->bound )
+                       return;
+
+               return $this->nodes;
        }
 
-       function render() {
-               ?>
-               <div id="wpadminbar">
-                       <div class="quicklinks">
-                               <ul>
-                                       <?php foreach ( (array) $this->menu as $id => $menu_item ) : ?>
-                                               <?php $this->recursive_render( $id, $menu_item ) ?>
-                                       <?php endforeach; ?>
-                               </ul>
-                       </div>
+       /**
+        * Add a group to a menu node.
+        *
+        * @since 3.3.0
+        *
+        * @param array $args - The arguments for each node.
+        * - id         - string    - The ID of the item.
+        * - parent     - string    - The ID of the parent node. Optional. Default root.
+        * - meta       - array     - Meta data including the following keys: class, onclick, target, title.
+        */
+       final public function add_group( $args ) {
+               $args['group'] = true;
+
+               $this->add_node( $args );
+       }
 
-                       <div id="adminbarsearch-wrap">
-                               <form action="<?php echo home_url(); ?>" method="get" id="adminbarsearch">
-                                       <input class="adminbar-input" name="s" id="adminbar-search" type="text" value="" maxlength="150" />
-                                       <input type="submit" class="adminbar-button" value="<?php _e('Search'); ?>"/>
-                               </form>
-                       </div>
-               </div>
+       /**
+        * Remove a node.
+        *
+        * @param string The ID of the item.
+        */
+       public function remove_node( $id ) {
+               $this->_unset_node( $id );
+       }
 
-               <?php
-               /* Wipe the menu, might reduce memory usage, but probably not. */
-               $this->menu = null;
+       final protected function _unset_node( $id ) {
+               unset( $this->nodes[ $id ] );
        }
 
-       /* Helpers */
-       function recursive_render( $id, &$menu_item ) { ?>
-               <?php
-               $is_parent =  ! empty( $menu_item['children'] );
+       public function render() {
+               $root = $this->_bind();
+               if ( $root )
+                       $this->_render( $root );
+       }
 
-               $menuclass = $is_parent ? 'menupop' : '';
-               if ( ! empty( $menu_item['meta']['class'] ) )
-                       $menuclass .= ' ' . $menu_item['meta']['class'];
-               ?>
+       final protected function _bind() {
+               if ( $this->bound )
+                       return;
 
-               <li id="<?php echo esc_attr( "wp-admin-bar-$id" ); ?>" class="<?php echo esc_attr( $menuclass ); ?>">
-                       <a href="<?php echo esc_url( $menu_item['href'] ) ?>"<?php
-                               if ( ! empty( $menu_item['meta']['onclick'] ) ) :
-                                       ?> onclick="<?php echo esc_js( $menu_item['meta']['onclick'] ); ?>"<?php
-                               endif;
-                       if ( ! empty( $menu_item['meta']['target'] ) ) :
-                               ?> target="<?php echo esc_attr( $menu_item['meta']['target'] ); ?>"<?php
-                       endif;
-                       if ( ! empty( $menu_item['meta']['title'] ) ) :
-                               ?> title="<?php echo esc_attr( $menu_item['meta']['title'] ); ?>"<?php
-                       endif;
+               // Add the root node.
+               // Clear it first, just in case. Don't mess with The Root.
+               $this->remove_node( 'root' );
+               $this->add_node( array(
+                       'id'    => 'root',
+                       'group' => false,
+               ) );
+
+               // Normalize nodes: define internal 'children' and 'type' properties.
+               foreach ( $this->_get_nodes() as $node ) {
+                       $node->children = array();
+                       $node->type = ( $node->group ) ? 'group' : 'item';
+                       unset( $node->group );
+
+                       // The Root wants your orphans. No lonely items allowed.
+                       if ( ! $node->parent )
+                               $node->parent = 'root';
+               }
 
-                       ?>><?php
+               foreach ( $this->_get_nodes() as $node ) {
+                       if ( 'root' == $node->id )
+                               continue;
 
-                       if ( $is_parent ) :
-                               ?><span><?php
-                       endif;
+                       // Fetch the parent node. If it isn't registered, ignore the node.
+                       if ( ! $parent = $this->_get_node( $node->parent ) ) {
+                               continue;
+                       }
 
-                       echo $menu_item['title'];
+                       // Generate the group class (we distinguish between top level and other level groups).
+                       $group_class = ( $node->parent == 'root' ) ? 'ab-top-menu' : 'ab-submenu';
 
-                       if ( $is_parent ) :
-                               ?></span><?php
-                       endif;
+                       if ( $node->type == 'group' ) {
+                               if ( empty( $node->meta['class'] ) )
+                                       $node->meta['class'] = $group_class;
+                               else
+                                       $node->meta['class'] .= ' ' . $group_class;
+                       }
 
-                       ?></a>
+                       // Items in items aren't allowed. Wrap nested items in 'default' groups.
+                       if ( $parent->type == 'item' && $node->type == 'item' ) {
+                               $default_id = $parent->id . '-default';
+                               $default    = $this->_get_node( $default_id );
+
+                               // The default group is added here to allow groups that are
+                               // added before standard menu items to render first.
+                               if ( ! $default ) {
+                                       // Use _set_node because add_node can be overloaded.
+                                       // Make sure to specify default settings for all properties.
+                                       $this->_set_node( array(
+                                               'id'        => $default_id,
+                                               'parent'    => $parent->id,
+                                               'type'      => 'group',
+                                               'children'  => array(),
+                                               'meta'      => array(
+                                                       'class'     => $group_class,
+                                               ),
+                                               'title'     => false,
+                                               'href'      => false,
+                                       ) );
+                                       $default = $this->_get_node( $default_id );
+                                       $parent->children[] = $default;
+                               }
+                               $parent = $default;
+
+                       // Groups in groups aren't allowed. Add a special 'container' node.
+                       // The container will invisibly wrap both groups.
+                       } elseif ( $parent->type == 'group' && $node->type == 'group' ) {
+                               $container_id = $parent->id . '-container';
+                               $container    = $this->_get_node( $container_id );
+
+                               // We need to create a container for this group, life is sad.
+                               if ( ! $container ) {
+                                       // Use _set_node because add_node can be overloaded.
+                                       // Make sure to specify default settings for all properties.
+                                       $this->_set_node( array(
+                                               'id'       => $container_id,
+                                               'type'     => 'container',
+                                               'children' => array( $parent ),
+                                               'parent'   => false,
+                                               'title'    => false,
+                                               'href'     => false,
+                                               'meta'     => array(),
+                                       ) );
+
+                                       $container = $this->_get_node( $container_id );
+
+                                       // Link the container node if a grandparent node exists.
+                                       $grandparent = $this->_get_node( $parent->parent );
+
+                                       if ( $grandparent ) {
+                                               $container->parent = $grandparent->id;
+
+                                               $index = array_search( $parent, $grandparent->children, true );
+                                               if ( $index === false )
+                                                       $grandparent->children[] = $container;
+                                               else
+                                                       array_splice( $grandparent->children, $index, 1, array( $container ) );
+                                       }
+
+                                       $parent->parent = $container->id;
+                               }
+
+                               $parent = $container;
+                       }
 
-                       <?php if ( $is_parent ) : ?>
-                       <ul>
-                               <?php foreach ( $menu_item['children'] as $child_id => $child_menu_item ) : ?>
-                                       <?php $this->recursive_render( $child_id, $child_menu_item ); ?>
-                               <?php endforeach; ?>
-                       </ul>
-                       <?php endif; ?>
+                       // Update the parent ID (it might have changed).
+                       $node->parent = $parent->id;
 
-                       <?php if ( ! empty( $menu_item['meta']['html'] ) ) : ?>
-                               <?php echo $menu_item['meta']['html']; ?>
+                       // Add the node to the tree.
+                       $parent->children[] = $node;
+               }
+
+               $root = $this->_get_node( 'root' );
+               $this->bound = true;
+               return $root;
+       }
+
+       final protected function _render( $root ) {
+               global $is_IE;
+
+               // Add browser classes.
+               // We have to do this here since admin bar shows on the front end.
+               $class = 'nojq nojs';
+               if ( $is_IE ) {
+                       if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) )
+                               $class .= ' ie7';
+                       elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) )
+                               $class .= ' ie8';
+                       elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) )
+                               $class .= ' ie9';
+               } elseif ( wp_is_mobile() ) {
+                       $class .= ' mobile';
+               }
+
+               ?>
+               <div id="wpadminbar" class="<?php echo $class; ?>" role="navigation">
+                       <a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e('Skip to toolbar'); ?></a>
+                       <div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e('Top navigation toolbar.'); ?>" tabindex="0">
+                               <?php foreach ( $root->children as $group ) {
+                                       $this->_render_group( $group );
+                               } ?>
+                       </div>
+                       <?php if ( is_user_logged_in() ) : ?>
+                       <a class="screen-reader-shortcut" href="<?php echo esc_url( wp_logout_url() ); ?>"><?php _e('Log Out'); ?></a>
                        <?php endif; ?>
-               </li><?php
+               </div>
+
+               <?php
        }
 
-       function add_node( $parent_id, &$menu, $child ) {
-               foreach( $menu as $id => $menu_item ) {
-                       if ( $parent_id == $id ) {
-                               $menu->{$parent_id}['children']->{$child['id']} = $child;
-                               $child = null;
-                               return true;
+       final protected function _render_container( $node ) {
+               if ( $node->type != 'container' || empty( $node->children ) )
+                       return;
+
+               ?><div id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>" class="ab-group-container"><?php
+                       foreach ( $node->children as $group ) {
+                               $this->_render_group( $group );
                        }
+               ?></div><?php
+       }
 
-                       if ( ! empty( $menu->{$id}['children'] ) )
-                               $this->add_node( $parent_id, $menu->{$id}['children'], $child );
-               }
+       final protected function _render_group( $node ) {
+               if ( $node->type == 'container' )
+                       return $this->_render_container( $node );
 
-               $child = null;
+               if ( $node->type != 'group' || empty( $node->children ) )
+                       return;
 
-               return false;
+               if ( ! empty( $node->meta['class'] ) )
+                       $class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
+               else
+                       $class = '';
+
+               ?><ul id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $class; ?>><?php
+                       foreach ( $node->children as $item ) {
+                               $this->_render_item( $item );
+                       }
+               ?></ul><?php
        }
 
-       function add_menus() {
-               add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 10 );
-               add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
-               add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 30 );
-               add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 80 );
-               add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 70 );
-
-               if ( !is_network_admin() && !is_user_admin() ) {
-                       add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 40 );
-                       add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 50 );
-                       add_action( 'admin_bar_menu', 'wp_admin_bar_appearance_menu', 60 );
+       final protected function _render_item( $node ) {
+               if ( $node->type != 'item' )
+                       return;
+
+               $is_parent = ! empty( $node->children );
+               $has_link  = ! empty( $node->href );
+
+               $tabindex = isset( $node->meta['tabindex'] ) ? (int) $node->meta['tabindex'] : '';
+               $aria_attributes = $tabindex ? 'tabindex="' . $tabindex . '"' : '';
+
+               $menuclass = '';
+
+               if ( $is_parent ) {
+                       $menuclass = 'menupop ';
+                       $aria_attributes .= ' aria-haspopup="true"';
                }
 
-               do_action( 'add_admin_bar_menus' );
+               if ( ! empty( $node->meta['class'] ) )
+                       $menuclass .= $node->meta['class'];
+
+               if ( $menuclass )
+                       $menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
+
+               ?>
+
+               <li id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $menuclass; ?>><?php
+                       if ( $has_link ):
+                               ?><a class="ab-item" <?php echo $aria_attributes; ?> href="<?php echo esc_url( $node->href ) ?>"<?php
+                                       if ( ! empty( $node->meta['onclick'] ) ) :
+                                               ?> onclick="<?php echo esc_js( $node->meta['onclick'] ); ?>"<?php
+                                       endif;
+                               if ( ! empty( $node->meta['target'] ) ) :
+                                       ?> target="<?php echo esc_attr( $node->meta['target'] ); ?>"<?php
+                               endif;
+                               if ( ! empty( $node->meta['title'] ) ) :
+                                       ?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+                               endif;
+                               ?>><?php
+                       else:
+                               ?><div class="ab-item ab-empty-item" <?php echo $aria_attributes;
+                               if ( ! empty( $node->meta['title'] ) ) :
+                                       ?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+                               endif;
+                               ?>><?php
+                       endif;
+
+                       echo $node->title;
+
+                       if ( $has_link ) :
+                               ?></a><?php
+                       else:
+                               ?></div><?php
+                       endif;
+
+                       if ( $is_parent ) :
+                               ?><div class="ab-sub-wrapper"><?php
+                                       foreach ( $node->children as $group ) {
+                                               $this->_render_group( $group );
+                                       }
+                               ?></div><?php
+                       endif;
+
+                       if ( ! empty( $node->meta['html'] ) )
+                               echo $node->meta['html'];
+
+                       ?>
+               </li><?php
        }
 
-       function remove_node( $id, &$menu ) {
-               if ( isset( $menu->$id ) ) {
-                       unset( $menu->$id );
-                       return true;
-               }
+       public function recursive_render( $id, $node ) {
+               _deprecated_function( __METHOD__, '3.3', 'WP_Admin_bar::render(), WP_Admin_Bar::_render_item()' );
+               $this->_render_item( $node );
+       }
+
+       public function add_menus() {
+               // User related, aligned right.
+               add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 0 );
+               add_action( 'admin_bar_menu', 'wp_admin_bar_search_menu', 4 );
+               add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_item', 7 );
 
-               foreach( $menu as $menu_item_id => $menu_item ) {
-                       if ( ! empty( $menu->{$menu_item_id}['children'] ) )
-                               $this->remove_node( $id, $menu->{$menu_item_id}['children'] );
+               // Site related.
+               add_action( 'admin_bar_menu', 'wp_admin_bar_wp_menu', 10 );
+               add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
+               add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 30 );
+               add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 40 );
+
+               // Content related.
+               if ( ! is_network_admin() && ! is_user_admin() ) {
+                       add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 60 );
+                       add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 70 );
                }
+               add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
 
-               return false;
-       }
+               add_action( 'admin_bar_menu', 'wp_admin_bar_add_secondary_groups', 200 );
 
-       // TODO: Convert to a core feature for multisite or remove
-       function load_user_locale_translations() {
-               $this->need_to_change_locale = ( get_locale() != $this->user->locale );
-               if ( ! $this->need_to_change_locale )
-                       return;
-               /*
-               $this->previous_translations = get_translations_for_domain( 'default' );
-               $this->adminbar_locale_filter = lambda( '$_', '$GLOBALS["wp_admin_bar"]->user->locale;' );
-               unload_textdomain( 'default' );
-               add_filter( 'locale', $this->adminbar_locale_filter );
-               load_default_textdomain();
-               $this->changed_locale = true;
-               */
-       }
-
-       function unload_user_locale_translations() {
-               global $l10n;
-               if ( ! $this->changed_locale )
-                       return;
-               /*
-               remove_filter( 'locale', $this->adminbar_locale_filter );
-               $l10n['default'] = &$this->previous_translations;
-               */
+               do_action( 'add_admin_bar_menus' );
        }
 }
-?>