--- a/wp/wp-admin/menu-header.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-admin/menu-header.php Tue Jun 09 03:35:32 2015 +0200
@@ -19,7 +19,17 @@
$self = preg_replace('|^.*/mu-plugins/|i', '', $self);
global $menu, $submenu, $parent_file; //For when admin-header is included from within a function.
-$parent_file = apply_filters("parent_file", $parent_file); // For plugins to move submenu tabs around.
+
+/**
+ * Filter the parent file of an admin menu sub-menu item.
+ *
+ * Allows plugins to move sub-menu items around.
+ *
+ * @since MU
+ *
+ * @param string $parent_file The parent file.
+ */
+$parent_file = apply_filters( 'parent_file', $parent_file );
get_admin_page_parent();
@@ -37,18 +47,20 @@
global $self, $parent_file, $submenu_file, $plugin_page, $typenow;
$first = true;
- // 0 = name, 1 = capability, 2 = file, 3 = class, 4 = id, 5 = icon src
+ // 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes, 5 = hookname, 6 = icon_url
foreach ( $menu as $key => $item ) {
$admin_is_parent = false;
$class = array();
$aria_attributes = '';
+ $aria_hidden = '';
+ $is_separator = false;
if ( $first ) {
$class[] = 'wp-first-item';
$first = false;
}
- $submenu_items = false;
+ $submenu_items = array();
if ( ! empty( $submenu[$item[2]] ) ) {
$class[] = 'wp-has-submenu';
$submenu_items = $submenu[$item[2]];
@@ -63,22 +75,49 @@
}
if ( ! empty( $item[4] ) )
- $class[] = $item[4];
+ $class[] = esc_attr( $item[4] );
$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
$id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
- $img = '';
- // 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="" />';
+ $img = $img_style = '';
+ $img_class = ' dashicons-before';
+
+ if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
+ $is_separator = true;
+ }
+
+ /*
+ * 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. Dashicons and base64-encoded data:image/svg_xml URIs are also handled
+ * as special cases.
+ */
+ if ( ! empty( $item[6] ) ) {
+ $img = '<img src="' . $item[6] . '" alt="" />';
+
+ if ( 'none' === $item[6] || 'div' === $item[6] ) {
+ $img = '<br />';
+ } elseif ( 0 === strpos( $item[6], 'data:image/svg+xml;base64,' ) ) {
+ $img = '<br />';
+ $img_style = ' style="background-image:url(\'' . esc_attr( $item[6] ) . '\')"';
+ $img_class = ' svg';
+ } elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
+ $img = '<br />';
+ $img_class = ' dashicons-before ' . sanitize_html_class( $item[6] );
+ }
+ }
$arrow = '<div class="wp-menu-arrow"><div></div></div>';
$title = wptexturize( $item[0] );
- echo "\n\t<li$class$id>";
+ // hide separators from screen readers
+ if ( $is_separator ) {
+ $aria_hidden = ' aria-hidden="true"';
+ }
- if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
+ echo "\n\t<li$class$id$aria_hidden>";
+
+ if ( $is_separator ) {
echo '<div class="separator"></div>';
} elseif ( $submenu_as_parent && ! empty( $submenu_items ) ) {
$submenu_items = array_values( $submenu_items ); // Re-index.
@@ -88,9 +127,9 @@
$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;
- 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>";
+ echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
} else {
- 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>";
+ echo "\n\t<a href='{$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
}
} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
$menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
@@ -99,9 +138,9 @@
$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;
- 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>";
+ echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
} else {
- 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>";
+ echo "\n\t<a href='{$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
}
}
@@ -110,6 +149,8 @@
echo "<li class='wp-submenu-head'>{$item[0]}</li>";
$first = true;
+
+ // 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes
foreach ( $submenu_items as $sub_key => $sub_item ) {
if ( ! current_user_can( $sub_item[1] ) )
continue;
@@ -133,13 +174,17 @@
$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 (
+ } elseif (
( ! 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';
}
+ if ( ! empty( $sub_item[4] ) ) {
+ $class[] = esc_attr( $sub_item[4] );
+ }
+
$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
$menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
@@ -174,16 +219,24 @@
?>
+<div id="adminmenumain" role="navigation" aria-label="<?php esc_attr_e( 'Main menu' ); ?>">
+<a href="#wpbody-content" class="screen-reader-shortcut"><?php _e( 'Skip to main content' ); ?></a>
+<a href="#wp-toolbar" class="screen-reader-shortcut"><?php _e( 'Skip to toolbar' ); ?></a>
<div id="adminmenuback"></div>
<div id="adminmenuwrap">
-<div id="adminmenushadow"></div>
-<ul id="adminmenu" role="navigation">
+<ul id="adminmenu">
<?php
_wp_menu_output( $menu, $submenu );
+/**
+ * Fires after the admin menu has been output.
+ *
+ * @since 2.5.0
+ */
do_action( 'adminmenu' );
?>
</ul>
</div>
+</div>