X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..a5227bf01edbe6660486c9f5c0f0ed7b7fea3130:/wp-admin/menu-header.php diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php index 1f652455..2a9ee729 100644 --- a/wp-admin/menu-header.php +++ b/wp-admin/menu-header.php @@ -15,8 +15,10 @@ */ $self = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_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. +$parent_file = apply_filters("parent_file", $parent_file); // For plugins to move submenu tabs around. get_admin_page_parent(); @@ -31,7 +33,7 @@ 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, $pagenow, $typenow; $first = true; // 0 = name, 1 = capability, 2 = file, 3 = class, 4 = id, 5 = icon src @@ -45,21 +47,21 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) { if ( !empty($submenu[$item[2]]) ) $class[] = 'wp-has-submenu'; - if ( ( $parent_file && $item[2] == $parent_file ) || strcmp($self, $item[2]) == 0 ) { + if ( ( $parent_file && $item[2] == $parent_file ) || ( false === strpos($parent_file, '?') && $self == $item[2] ) ) { if ( !empty($submenu[$item[2]]) ) $class[] = 'wp-has-current-submenu wp-menu-open'; else $class[] = 'current'; } - if ( isset($item[4]) && ! empty($item[4]) ) + if ( ! empty($item[4]) ) $class[] = $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] ) . '"' : ''; + $id = ! empty($item[5]) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : ''; $img = ''; - if ( isset($item[6]) && ! empty($item[6]) ) { + if ( ! empty($item[6]) ) { if ( 'div' === $item[6] ) $img = '
'; else @@ -67,6 +69,8 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) { } $toggle = '

'; + $title = wptexturize($item[0]); + echo "\n\t"; if ( false !== strpos($class, 'wp-menu-separator') ) { @@ -74,15 +78,21 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) { } 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]); - if ( ( ('index.php' != $submenu[$item[2]][0][2]) && file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") ) || !empty($menu_hook)) { + $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)) { $admin_is_parent = true; - echo "
$img
$toggle{$item[0]}"; + echo "
$img
$toggle$title"; } else { - echo "\n\t
$img
$toggle{$item[0]}"; + echo "\n\t
$img
$toggle$title"; } } else if ( current_user_can($item[1]) ) { $menu_hook = get_plugin_page_hook($item[2], 'admin.php'); - if ( ('index.php' != $item[2]) && file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || !empty($menu_hook) ) { + $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) ) { $admin_is_parent = true; echo "\n\t
$img
$toggle{$item[0]}"; } else { @@ -102,30 +112,46 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) { $class[] = 'wp-first-item'; $first = false; } + + $menu_file = $item[2]; + + 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. + if ( !empty($typenow) ) + $self_type = $self . '?post_type=' . $typenow; + else + $self_type = '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($item[2]) || ($item[2] == $self))) || (!isset($plugin_page) && $self == $sub_item[2]) ) { + } 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]) ) { $class[] = 'current'; } $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, '?') ) + $sub_file = substr($sub_file, 0, $pos); + + $title = wptexturize($sub_item[0]); - if ( ( ('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR . "/{$sub_item[2]}") ) || ! empty($menu_hook) ) { + 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 - $parent_exists = (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/{$item[2]}") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}") ) || file_exists($item[2]); - if ( $parent_exists ) - echo "{$sub_item[0]}"; - elseif ( 'admin.php' == $pagenow || !$parent_exists ) - echo "{$sub_item[0]}"; + 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 "";