Skip to content

Commit daaedd9

Browse files
committed
Fix links for submenus added to existing menus. see WordPress#7948
git-svn-id: https://develop.svn.wordpress.org/trunk@9285 602fd350-edb4-49c9-b593-d223f7449a82
1 parent f2f9e89 commit daaedd9

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

wp-admin/menu-header.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ function _wp_menu_output( &$menu, &$submenu, $submenu_as_parent = true ) {
102102
$menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
103103

104104
if ( file_exists(WP_PLUGIN_DIR . "/{$sub_item[2]}") || ! empty($menu_hook) ) {
105-
if ( 'admin.php' == $pagenow || !file_exists(WP_PLUGIN_DIR . "/$parent_file") )
105+
// If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
106+
if ( 'admin.php' == $pagenow || ( (!file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || is_dir(WP_PLUGIN_DIR . "/{$item[2]}") ) && !file_exists($item[2])) )
106107
echo "<li$class><a href='admin.php?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>";
107108
else
108109
echo "<li$class><a href='{$item[2]}?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>";

0 commit comments

Comments
 (0)