WordPress 3.7.1

[autoinstalls/wordpress.git] / wp-admin / menu-header.php

diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index dfa1ccbba596d620f986c156a47f2ffa5de59550..10ad1395ecf8f6704c34cabe267edb7302c6492b 100644 (file)
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -34,78 +34,84 @@ get_admin_page_parent();
  * @param bool $submenu_as_parent
  */
 function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
  * @param bool $submenu_as_parent
  */
 function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {

-       global $self, $parent_file, $submenu_file, $plugin_page, $pagenow, $typenow;
+       global $self, $parent_file, $submenu_file, $plugin_page, $typenow;

 
        $first = true;
        // 0 = name, 1 = capability, 2 = file, 3 = class, 4 = id, 5 = icon src
        foreach ( $menu as $key => $item ) {
                $admin_is_parent = false;
                $class = array();
 
        $first = true;
        // 0 = name, 1 = capability, 2 = file, 3 = class, 4 = id, 5 = icon src
        foreach ( $menu as $key => $item ) {
                $admin_is_parent = false;
                $class = array();

+               $aria_attributes = '';
+

                if ( $first ) {
                        $class[] = 'wp-first-item';
                        $first = false;
                }
                if ( $first ) {
                        $class[] = 'wp-first-item';
                        $first = false;
                }

-               if ( !empty($submenu[$item[2]]) )
+
+               $submenu_items = false;
+               if ( ! empty( $submenu[$item[2]] ) ) {

                        $class[] = 'wp-has-submenu';
                        $class[] = 'wp-has-submenu';

+                       $submenu_items = $submenu[$item[2]];
+               }

 
                if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
 
                if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {

-                       if ( !empty($submenu[$item[2]]) )
-                               $class[] = 'wp-has-current-submenu wp-menu-open';
-                       else
-                               $class[] = 'current';
+                       $class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current';
+               } else {
+                       $class[] = 'wp-not-current-submenu';
+                       if ( ! empty( $submenu_items ) )
+                               $aria_attributes .= 'aria-haspopup="true"';

                }
 
                }
 

-               if ( ! empty($item[4]) )
+               if ( ! empty( $item[4] ) )

                        $class[] = $item[4];
 
                $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
                        $class[] = $item[4];
 
                $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';

-               $tabindex = ' tabindex="1"';
-               $id = ! empty($item[5]) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
+               $id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';

                $img = '';
                $img = '';

-               if ( ! empty($item[6]) ) {
-                       if ( 'div' === $item[6] )
-                               $img = '<br />';
-                       else
-                               $img = '<img src="' . $item[6] . '" alt="" />';
-               }
-               $toggle = '<div class="wp-menu-toggle"><br /></div>';
+               // if the string 'none' (previously 'div') is passed instead of an URL, don't output the default menu image
+               // so an icon can be added to div.wp-menu-image as background with CSS.
+               if ( ! empty( $item[6] ) )
+                       $img = ( 'none' === $item[6] || 'div' === $item[6] ) ? '<br />' : '<img src="' . $item[6] . '" alt="" />';
+               $arrow = '<div class="wp-menu-arrow"><div></div></div>';

 
 

-               $title = wptexturize($item[0]);
+               $title = wptexturize( $item[0] );

 
                echo "\n\t<li$class$id>";
 
 
                echo "\n\t<li$class$id>";
 

-               if ( false !== strpos($class, 'wp-menu-separator') ) {
-                       echo '<a class="separator" href="?unfoldmenu=1"><br /></a>';
-               } elseif ( $submenu_as_parent && !empty($submenu[$item[2]]) ) {
-                       $submenu[$item[2]] = array_values($submenu[$item[2]]);  // Re-index.
-                       $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
-                       $menu_file = $submenu[$item[2]][0][2];
-                       if ( false !== $pos = strpos($menu_file, '?') )
-                               $menu_file = substr($menu_file, 0, $pos);
-                       if ( ( ('index.php' != $submenu[$item[2]][0][2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") ) || !empty($menu_hook)) {
+               if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
+                       echo '<div class="separator"></div>';
+               } elseif ( $submenu_as_parent && ! empty( $submenu_items ) ) {
+                       $submenu_items = array_values( $submenu_items );  // Re-index.
+                       $menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
+                       $menu_file = $submenu_items[0][2];
+                       if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+                               $menu_file = substr( $menu_file, 0, $pos );
+                       if ( ! empty( $menu_hook ) || ( ( 'index.php' != $submenu_items[0][2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {

                                $admin_is_parent = true;
                                $admin_is_parent = true;

-                               echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu[$item[2]][0][2]}'>$img</a></div>$toggle<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>";
+                               echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image'>$img</div><div class='wp-menu-name'>$title</div></a>";

                        } else {
                        } else {

-                               echo "\n\t<div class='wp-menu-image'><a href='{$submenu[$item[2]][0][2]}'>$img</a></div>$toggle<a href='{$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>";
+                               echo "\n\t<a href='{$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image'>$img</div><div class='wp-menu-name'>$title</div></a>";

                        }
                        }

-               } else if ( current_user_can($item[1]) ) {
-                       $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
+               } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
+                       $menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );

                        $menu_file = $item[2];
                        $menu_file = $item[2];

-                       if ( false !== $pos = strpos($menu_file, '?') )
-                               $menu_file = substr($menu_file, 0, $pos);
-                       if ( ('index.php' != $item[2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") || !empty($menu_hook) ) {
+                       if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+                               $menu_file = substr( $menu_file, 0, $pos );
+                       if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {

                                $admin_is_parent = true;
                                $admin_is_parent = true;

-                               echo "\n\t<div class='wp-menu-image'><a href='admin.php?page={$item[2]}'>$img</a></div>$toggle<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>";
+                               echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image'>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";

                        } else {
                        } else {

-                               echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}'>$img</a></div>$toggle<a href='{$item[2]}'$class$tabindex>{$item[0]}</a>";
+                               echo "\n\t<a href='{$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image'>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";

                        }
                }
 
                        }
                }
 

-               if ( !empty($submenu[$item[2]]) ) {
-                       echo "\n\t<div class='wp-submenu'><div class='wp-submenu-head'>{$item[0]}</div><ul>";
+               if ( ! empty( $submenu_items ) ) {
+                       echo "\n\t<ul class='wp-submenu wp-submenu-wrap'>";
+                       echo "<li class='wp-submenu-head'>{$item[0]}</li>";
+

                        $first = true;
                        $first = true;

-                       foreach ( $submenu[$item[2]] as $sub_key => $sub_item ) {
-                               if ( !current_user_can($sub_item[1]) )
+                       foreach ( $submenu_items as $sub_key => $sub_item ) {
+                               if ( ! current_user_can( $sub_item[1] ) )

                                        continue;
 
                                $class = array();
                                        continue;
 
                                $class = array();


@@ -116,21 +122,21 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 
                                $menu_file = $item[2];
 
 
                                $menu_file = $item[2];
 

-                               if ( false !== $pos = strpos($menu_file, '?') )
-                                       $menu_file = substr($menu_file, 0, $pos);
+                               if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+                                       $menu_file = substr( $menu_file, 0, $pos );

 
                                // Handle current for post_type=post|page|foo pages, which won't match $self.
 
                                // Handle current for post_type=post|page|foo pages, which won't match $self.

-                               if ( !empty($typenow) )
-                                       $self_type = $self . '?post_type=' . $typenow;
-                               else
-                                       $self_type = 'nothing';
+                               $self_type = ! empty( $typenow ) ? $self . '?post_type=' . $typenow : 'nothing';

 
 

-                               if ( isset($submenu_file) ) {
+                               if ( isset( $submenu_file ) ) {

                                        if ( $submenu_file == $sub_item[2] )
                                                $class[] = 'current';
                                // If plugin_page is set the parent must either match the current page or not physically exist.
                                // This allows plugin pages with the same hook to exist under different parents.
                                        if ( $submenu_file == $sub_item[2] )
                                                $class[] = 'current';
                                // If plugin_page is set the parent must either match the current page or not physically exist.
                                // This allows plugin pages with the same hook to exist under different parents.

-                               } else if ( (isset($plugin_page) && $plugin_page == $sub_item[2] && (!file_exists($menu_file) || ($item[2] == $self) || ($item[2] == $self_type))) || (!isset($plugin_page) && $self == $sub_item[2]) ) {
+                               } else if (
+                                       ( ! isset( $plugin_page ) && $self == $sub_item[2] ) ||
+                                       ( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false ) )
+                               ) {

                                        $class[] = 'current';
                                }
 
                                        $class[] = 'current';
                                }
 


@@ -138,32 +144,40 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 
                                $menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
                                $sub_file = $sub_item[2];
 
                                $menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
                                $sub_file = $sub_item[2];

-                               if ( false !== $pos = strpos($sub_file, '?') )
+                               if ( false !== ( $pos = strpos( $sub_file, '?' ) ) )

                                        $sub_file = substr($sub_file, 0, $pos);
 
                                $title = wptexturize($sub_item[0]);
 
                                        $sub_file = substr($sub_file, 0, $pos);
 
                                $title = wptexturize($sub_item[0]);
 

-                               if ( ( ('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR . "/$sub_file") ) || ! empty($menu_hook) ) {
+                               if ( ! empty( $menu_hook ) || ( ( 'index.php' != $sub_item[2] ) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) ) ) {

                                        // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
                                        // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir

-                                       if ( (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/$menu_file") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}")) || file_exists($menu_file) )
-                                               $sub_item_url = add_query_arg( array('page' => $sub_item[2]), $item[2] );
+                                       if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) )
+                                               $sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), $item[2] );

                                        else
                                        else

-                                               $sub_item_url = add_query_arg( array('page' => $sub_item[2]), 'admin.php' );
-                                       $sub_item_url = esc_url($sub_item_url);
-                                       echo "<li$class><a href='$sub_item_url'$class$tabindex>$title</a></li>";
+                                               $sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), 'admin.php' );
+
+                                       $sub_item_url = esc_url( $sub_item_url );
+                                       echo "<li$class><a href='$sub_item_url'$class>$title</a></li>";

                                } else {
                                } else {

-                                       echo "<li$class><a href='{$sub_item[2]}'$class$tabindex>$title</a></li>";
+                                       echo "<li$class><a href='{$sub_item[2]}'$class>$title</a></li>";

                                }
                        }
                                }
                        }

-                       echo "</ul></div>";
+                       echo "</ul>";

                }
                echo "</li>";
        }
                }
                echo "</li>";
        }

+
+       echo '<li id="collapse-menu" class="hide-if-no-js"><div id="collapse-button"><div></div></div>';
+       echo '<span>' . esc_html__( 'Collapse menu' ) . '</span>';
+       echo '</li>';

 }
 
 ?>
 
 }
 
 ?>
 

-<ul id="adminmenu">
+<div id="adminmenuback"></div>
+<div id="adminmenuwrap">
+<div id="adminmenushadow"></div>
+<ul id="adminmenu" role="navigation">

 
 <?php
 
 
 <?php
 


@@ -172,3 +186,4 @@ do_action( 'adminmenu' );
 
 ?>
 </ul>
 
 ?>
 </ul>

+</div>