summaryrefslogtreecommitdiffstats
path: root/wp-admin/menu-header.php
diff options
context:
space:
mode:
Diffstat (limited to 'wp-admin/menu-header.php')
-rw-r--r--wp-admin/menu-header.php17
1 files changed, 12 insertions, 5 deletions
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index d113276..046590e 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -10,8 +10,15 @@ foreach ($menu as $item) {
// 0 = name, 1 = capability, 2 = file
if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
-
- if ( !empty($submenu[$item[2]]) || current_user_can($item[1]) ) {
+
+ if ( !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 ( file_exists(ABSPATH . PLUGINDIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
+ echo "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
+ else
+ echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
+ } else if ( current_user_can($item[1]) ) {
if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") )
echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
else
@@ -27,8 +34,8 @@ foreach ($menu as $item) {
if ( isset($submenu["$parent_file"]) ) :
?>
<ul id="submenu">
-<?php
-foreach ($submenu["$parent_file"] as $item) :
+<?php
+foreach ($submenu["$parent_file"] as $item) :
if ( !current_user_can($item[1]) )
continue;
@@ -58,7 +65,7 @@ else :
<div id="minisub"></div>
<?php
-endif;
+endif;
do_action('admin_notices');