X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..fcaa67f093b5c83deea7a361a8cf8c6ac4e832d3:/wp-admin/menu-header.php diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php index df97ad6a..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,76 +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 = '
'; - else - $img = ''; + } elseif ( 0 === strpos( $item[6], 'data:image/svg+xml;base64,' ) ) { + $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 = '

'; - - echo "\n\t"; - - if ( false !== strpos($class, 'wp-menu-separator') ) { - echo '
'; - } 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)) { + $arrow = '
'; + + $title = wptexturize( $item[0] ); + + // hide separators from screen readers + if ( $is_separator ) { + $aria_hidden = ' aria-hidden="true"'; + } + + echo "\n\t"; + + if ( $is_separator ) { + echo '
'; + } 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; - echo "
$img
$toggle{$item[0]}"; + echo "$arrow
$img
$title
"; } else { - echo "\n\t
$img
$toggle{$item[0]}"; + echo "\n\t$arrow
$img
$title
"; } - } 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]; - 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; - echo "\n\t
$img
$toggle{$item[0]}"; + echo "\n\t$arrow
$img
{$item[0]}
"; } else { - echo "\n\t
$img
$toggle{$item[0]}"; + echo "\n\t$arrow
$img
{$item[0]}
"; } } - if ( !empty($submenu[$item[2]]) ) { - echo "\n\t
{$item[0]}
    "; + if ( ! empty( $submenu_items ) ) { + echo "\n\t
      "; + echo "
    • {$item[0]}
      • "; + $first = true; - foreach ( $submenu[$item[2]] as $sub_key => $sub_item ) { - if ( !current_user_can($sub_item[1]) ) + + // 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; $class = array(); @@ -110,53 +162,81 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) { } $menu_file = $item[2]; - if ( false !== $pos = strpos($menu_file, '?') ) - $menu_file = substr($menu_file, 0, $pos); - if ( isset($submenu_file) ) { + 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. + $self_type = ! empty( $typenow ) ? $self . '?post_type=' . $typenow : 'nothing'; + + 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. - } else if ( (isset($plugin_page) && $plugin_page == $sub_item[2] && (!file_exists($menu_file) || ($item[2] == $self))) || (!isset($plugin_page) && $self == $sub_item[2]) ) { + } 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]); $sub_file = $sub_item[2]; - if ( false !== $pos = strpos($sub_file, '?') ) + if ( false !== ( $pos = strpos( $sub_file, '?' ) ) ) $sub_file = substr($sub_file, 0, $pos); - if ( ( ('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR . "/$sub_file") ) || ! empty($menu_hook) ) { - // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir + $title = wptexturize($sub_item[0]); - $parent_exists = (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/$menu_file") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}") ) || file_exists($menu_file); - if ( $parent_exists ) - echo "{$sub_item[0]}"; - elseif ( 'admin.php' == $pagenow || !$parent_exists ) - echo "{$sub_item[0]}"; + 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_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 - echo "{$sub_item[0]}"; + $sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), 'admin.php' ); + + $sub_item_url = esc_url( $sub_item_url ); + echo "$title"; } else { - echo "{$sub_item[0]}"; + echo "$title"; } } - echo "
"; + echo ""; } echo ""; } + + echo '
  • '; + echo '' . esc_html__( 'Collapse menu' ) . ''; + echo '
    • '; } ?> +