WordPress 4.4

[autoinstalls/wordpress.git] / wp-includes / class-wp-admin-bar.php

diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php
index f8ee5e2d937077d223937e71749f0b37f98e4eae..f40210085e7fce594da5c2403df5002817c0bec9 100644 (file)
--- a/wp-includes/class-wp-admin-bar.php
+++ b/wp-includes/class-wp-admin-bar.php
@@ -1,29 +1,40 @@
 <?php
 /**
 <?php
 /**

- * The WordPress Toolbar
- *
- * @since 3.1.0
+ * Toolbar API: WP_Admin_Bar class

  *
  * @package WordPress
  * @subpackage Toolbar
  *
  * @package WordPress
  * @subpackage Toolbar

+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement the Toolbar API.
+ *
+ * @since 3.1.0

  */
 class WP_Admin_Bar {
        private $nodes = array();
        private $bound = false;
        public $user;
 
  */
 class WP_Admin_Bar {
        private $nodes = array();
        private $bound = false;
        public $user;
 

+       /**
+        * @param string $name
+        * @return string|array|void
+        */

        public function __get( $name ) {
                switch ( $name ) {
                        case 'proto' :
                                return is_ssl() ? 'https://' : 'http://';
        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.
                        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;

                }
        }
 
                }
        }
 

+       /**
+        * @access public
+        */

        public function initialize() {
                $this->user = new stdClass;
 
        public function initialize() {
                $this->user = new stdClass;
 


@@ -46,7 +57,11 @@ class WP_Admin_Bar {
                add_action( 'admin_head', 'wp_admin_bar_header' );
 
                if ( current_theme_supports( 'admin-bar' ) ) {
                add_action( 'admin_head', 'wp_admin_bar_header' );
 
                if ( current_theme_supports( 'admin-bar' ) ) {

-                       $admin_bar_args = get_theme_support( 'admin-bar' ); // add_theme_support( 'admin-bar', array( 'callback' => '__return_false') );
+                       /**
+                        * To remove the default padding styles from WordPress for the Toolbar, use the following code:
+                        * add_theme_support( 'admin-bar', array( 'callback' => '__return_false' ) );
+                        */
+                       $admin_bar_args = get_theme_support( 'admin-bar' );

                        $header_callback = $admin_bar_args[0]['callback'];
                }
 
                        $header_callback = $admin_bar_args[0]['callback'];
                }
 


@@ -58,13 +73,24 @@ class WP_Admin_Bar {
                wp_enqueue_script( 'admin-bar' );
                wp_enqueue_style( 'admin-bar' );
 
                wp_enqueue_script( 'admin-bar' );
                wp_enqueue_style( 'admin-bar' );
 

+               /**
+                * Fires after WP_Admin_Bar is initialized.
+                *
+                * @since 3.1.0
+                */

                do_action( 'admin_bar_init' );
        }
 
                do_action( 'admin_bar_init' );
        }
 

+       /**
+        * @param array $node
+        */

        public function add_menu( $node ) {
                $this->add_node( $node );
        }
 
        public function add_menu( $node ) {
                $this->add_node( $node );
        }
 

+       /**
+        * @param string $id
+        */

        public function remove_menu( $id ) {
                $this->remove_node( $id );
        }
        public function remove_menu( $id ) {
                $this->remove_node( $id );
        }


@@ -72,13 +98,17 @@ class WP_Admin_Bar {
        /**
         * Add a node to the menu.
         *
        /**
         * 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.
+        * @param array $args {
+        *     Arguments for adding a node.
+        *
+        *     @type string $id     ID of the item.
+        *     @type string $title  Title of the node.
+        *     @type string $parent Optional. ID of the parent node.
+        *     @type string $href   Optional. Link for the item.
+        *     @type bool   $group  Optional. Whether or not the node is a group. Default false.
+        *     @type array  $meta   Meta data including the following keys: 'html', 'class', 'rel',
+        *                          'onclick', 'target', 'title', 'tabindex'. Default empty.
+        * }

         */
        public function add_node( $args ) {
                // Shim for old method signature: add_node( $parent_id, $menu_obj, $args )
         */
        public function add_node( $args ) {
                // Shim for old method signature: add_node( $parent_id, $menu_obj, $args )


@@ -131,6 +161,9 @@ class WP_Admin_Bar {
                $this->_set_node( $args );
        }
 
                $this->_set_node( $args );
        }
 

+       /**
+        * @param array $args
+        */

        final protected function _set_node( $args ) {
                $this->nodes[ $args['id'] ] = (object) $args;
        }
        final protected function _set_node( $args ) {
                $this->nodes[ $args['id'] ] = (object) $args;
        }


@@ -138,6 +171,7 @@ class WP_Admin_Bar {
        /**
         * Gets a node.
         *
        /**
         * Gets a node.
         *

+        * @param string $id

         * @return object Node.
         */
        final public function get_node( $id ) {
         * @return object Node.
         */
        final public function get_node( $id ) {


@@ -145,6 +179,10 @@ class WP_Admin_Bar {
                        return clone $node;
        }
 
                        return clone $node;
        }
 

+       /**
+        * @param string $id
+        * @return object|void
+        */

        final protected function _get_node( $id ) {
                if ( $this->bound )
                        return;
        final protected function _get_node( $id ) {
                if ( $this->bound )
                        return;


@@ -156,6 +194,9 @@ class WP_Admin_Bar {
                        return $this->nodes[ $id ];
        }
 
                        return $this->nodes[ $id ];
        }
 

+       /**
+        * @return array|void
+        */

        final public function get_nodes() {
                if ( ! $nodes = $this->_get_nodes() )
                        return;
        final public function get_nodes() {
                if ( ! $nodes = $this->_get_nodes() )
                        return;


@@ -166,6 +207,9 @@ class WP_Admin_Bar {
                return $nodes;
        }
 
                return $nodes;
        }
 

+       /**
+        * @return array|void
+        */

        final protected function _get_nodes() {
                if ( $this->bound )
                        return;
        final protected function _get_nodes() {
                if ( $this->bound )
                        return;


@@ -178,10 +222,14 @@ class WP_Admin_Bar {
         *
         * @since 3.3.0
         *
         *
         * @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.
+        * @param array $args {
+        *     Array of arguments for adding a group.
+        *
+        *     @type string $id     ID of the item.
+        *     @type string $parent Optional. ID of the parent node. Default 'root'.
+        *     @type array  $meta   Meta data for the group including the following keys:
+        *                         'class', 'onclick', 'target', and 'title'.
+        * }

         */
        final public function add_group( $args ) {
                $args['group'] = true;
         */
        final public function add_group( $args ) {
                $args['group'] = true;


@@ -192,22 +240,31 @@ class WP_Admin_Bar {
        /**
         * Remove a node.
         *
        /**
         * Remove a node.
         *

-        * @param string The ID of the item.
+        * @param string $id The ID of the item.

         */
        public function remove_node( $id ) {
                $this->_unset_node( $id );
        }
 
         */
        public function remove_node( $id ) {
                $this->_unset_node( $id );
        }
 

+       /**
+        * @param string $id
+        */

        final protected function _unset_node( $id ) {
                unset( $this->nodes[ $id ] );
        }
 
        final protected function _unset_node( $id ) {
                unset( $this->nodes[ $id ] );
        }
 

+       /**
+        * @access public
+        */

        public function render() {
                $root = $this->_bind();
                if ( $root )
                        $this->_render( $root );
        }
 
        public function render() {
                $root = $this->_bind();
                if ( $root )
                        $this->_render( $root );
        }
 

+       /**
+        * @return object|void
+        */

        final protected function _bind() {
                if ( $this->bound )
                        return;
        final protected function _bind() {
                if ( $this->bound )
                        return;


@@ -329,6 +386,11 @@ class WP_Admin_Bar {
                return $root;
        }
 
                return $root;
        }
 

+       /**
+        *
+        * @global bool $is_IE
+        * @param object $root
+        */

        final protected function _render( $root ) {
                global $is_IE;
 
        final protected function _render( $root ) {
                global $is_IE;
 


@@ -347,19 +409,26 @@ class WP_Admin_Bar {
                }
 
                ?>
                }
 
                ?>

-               <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">
+               <div id="wpadminbar" class="<?php echo $class; ?>">
+                       <?php if ( ! is_admin() ) { ?>
+                               <a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e( 'Skip to toolbar' ); ?></a>
+                       <?php } ?>
+                       <div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e( 'Toolbar' ); ?>" tabindex="0">

                                <?php foreach ( $root->children as $group ) {
                                        $this->_render_group( $group );
                                } ?>
                        </div>
                                <?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>
                        <a class="screen-reader-shortcut" href="<?php echo esc_url( wp_logout_url() ); ?>"><?php _e('Log Out'); ?></a>

+                       <?php endif; ?>

                </div>
 
                <?php
        }
 
                </div>
 
                <?php
        }
 

+       /**
+        * @param object $node
+        */

        final protected function _render_container( $node ) {
                if ( $node->type != 'container' || empty( $node->children ) )
                        return;
        final protected function _render_container( $node ) {
                if ( $node->type != 'container' || empty( $node->children ) )
                        return;


@@ -371,10 +440,14 @@ class WP_Admin_Bar {
                ?></div><?php
        }
 
                ?></div><?php
        }
 

+       /**
+        * @param object $node
+        */

        final protected function _render_group( $node ) {
        final protected function _render_group( $node ) {

-               if ( $node->type == 'container' )
-                       return $this->_render_container( $node );
-
+               if ( $node->type == 'container' ) {
+                       $this->_render_container( $node );
+                       return;
+               }

                if ( $node->type != 'group' || empty( $node->children ) )
                        return;
 
                if ( $node->type != 'group' || empty( $node->children ) )
                        return;
 


@@ -390,6 +463,9 @@ class WP_Admin_Bar {
                ?></ul><?php
        }
 
                ?></ul><?php
        }
 

+       /**
+        * @param object $node
+        */

        final protected function _render_item( $node ) {
                if ( $node->type != 'item' )
                        return;
        final protected function _render_item( $node ) {
                if ( $node->type != 'item' )
                        return;


@@ -427,6 +503,9 @@ class WP_Admin_Bar {
                                if ( ! empty( $node->meta['title'] ) ) :
                                        ?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
                                endif;
                                if ( ! empty( $node->meta['title'] ) ) :
                                        ?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
                                endif;

+                               if ( ! empty( $node->meta['rel'] ) ) :
+                                       ?> rel="<?php echo esc_attr( $node->meta['rel'] ); ?>"<?php
+                               endif;

                                ?>><?php
                        else:
                                ?><div class="ab-item ab-empty-item" <?php echo $aria_attributes;
                                ?>><?php
                        else:
                                ?><div class="ab-item ab-empty-item" <?php echo $aria_attributes;


@@ -459,11 +538,18 @@ class WP_Admin_Bar {
                </li><?php
        }
 
                </li><?php
        }
 

+       /**
+        * @param string $id    Unused.
+        * @param object $node
+        */

        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 recursive_render( $id, $node ) {
                _deprecated_function( __METHOD__, '3.3', 'WP_Admin_bar::render(), WP_Admin_Bar::_render_item()' );
                $this->_render_item( $node );
        }
 

+       /**
+        * @access public
+        */

        public function add_menus() {
                // User related, aligned right.
                add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 0 );
        public function add_menus() {
                // User related, aligned right.
                add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 0 );


@@ -471,10 +557,12 @@ class WP_Admin_Bar {
                add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_item', 7 );
 
                // Site related.
                add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_item', 7 );
 
                // Site related.

+               add_action( 'admin_bar_menu', 'wp_admin_bar_sidebar_toggle', 0 );

                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_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 );
+               add_action( 'admin_bar_menu', 'wp_admin_bar_customize_menu', 40 );
+               add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 50 );

 
                // Content related.
                if ( ! is_network_admin() && ! is_user_admin() ) {
 
                // Content related.
                if ( ! is_network_admin() && ! is_user_admin() ) {


@@ -485,6 +573,11 @@ class WP_Admin_Bar {
 
                add_action( 'admin_bar_menu', 'wp_admin_bar_add_secondary_groups', 200 );
 
 
                add_action( 'admin_bar_menu', 'wp_admin_bar_add_secondary_groups', 200 );
 

+               /**
+                * Fires after menus are added to the menu bar.
+                *
+                * @since 3.1.0
+                */

                do_action( 'add_admin_bar_menus' );
        }
 }
                do_action( 'add_admin_bar_menus' );
        }
 }