X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9c40b4d36daed9e28e48a5fe9205c32557195a4b..58b0523c599c731e868bd4bc05b0d686a98d254f:/wp-admin/menu-header.php?unfoldmenu=1
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 1f652455..d73fe9bd 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -13,11 +13,24 @@
* @name $self
* @var string
*/
-$self = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);
+$self = preg_replace('|^.*/wp-admin/network/|i', '', $_SERVER['PHP_SELF']);
+$self = preg_replace('|^.*/wp-admin/|i', '', $self);
$self = preg_replace('|^.*/plugins/|i', '', $self);
+$self = preg_replace('|^.*/mu-plugins/|i', '', $self);
global $menu, $submenu, $parent_file; //For when admin-header is included from within a function.
+/**
+ * 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();
/**
@@ -31,70 +44,115 @@ get_admin_page_parent();
* @param bool $submenu_as_parent
*/
function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
- global $self, $parent_file, $submenu_file, $plugin_page, $pagenow;
+ 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;
}
- if ( !empty($submenu[$item[2]]) )
+
+ $submenu_items = array();
+ if ( ! empty( $submenu[$item[2]] ) ) {
$class[] = 'wp-has-submenu';
+ $submenu_items = $submenu[$item[2]];
+ }
- if ( ( $parent_file && $item[2] == $parent_file ) || strcmp($self, $item[2]) == 0 ) {
- if ( !empty($submenu[$item[2]]) )
- $class[] = 'wp-has-current-submenu wp-menu-open';
- else
- $class[] = 'current';
+ if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
+ $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 ( isset($item[4]) && ! empty($item[4]) )
- $class[] = $item[4];
+ if ( ! empty( $item[4] ) )
+ $class[] = esc_attr( $item[4] );
$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
- $tabindex = ' tabindex="1"';
- $id = isset($item[5]) && ! empty($item[5]) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
- $img = '';
- if ( isset($item[6]) && ! empty($item[6]) ) {
- if ( 'div' === $item[6] )
+ $id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
+ $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 = '';
+
+ if ( 'none' === $item[6] || 'div' === $item[6] ) {
+ $img = '
';
+ } elseif ( 0 === strpos( $item[6], 'data:image/svg+xml;base64,' ) ) {
$img = '
';
- else
- $img = '';
+ $img_style = ' style="background-image:url(\'' . esc_attr( $item[6] ) . '\')"';
+ $img_class = ' svg';
+ } elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
+ $img = '
';
+ $img_class = ' dashicons-before ' . sanitize_html_class( $item[6] );
+ }
}
- $toggle = '