Wordpress 2.3.2

[autoinstalls/wordpress.git] / wp-admin / menu-header.php

diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 352e3458fb47dfd0bd7a576bf223654217c06007..bbdfe1a7097bdeaab352a20b0a1f4905ffb8f9b6 100644 (file)
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -10,12 +10,19 @@ 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 ( current_user_can($item[1]) ) {
-               if ( file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") )
-                       echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";                  
+
+       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
-                       echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
+                       echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
        }
 }
 
@@ -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;
 
@@ -40,21 +47,25 @@ else $class = '';
 
 $menu_hook = get_plugin_page_hook($item[2], $parent_file);
 
-if (file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") || ! empty($menu_hook)) {
+if (file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") || ! empty($menu_hook)) {
        if ( 'admin.php' == $pagenow )
-               echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
+               echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
        else
-               echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>";
+               echo "\n\t<li><a href='{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>";
  } else {
-       echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>";
+       echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
  }
 endforeach;
 ?>
 
 </ul>
 <?php
+else :
+?>
+<div id="minisub"></div>
+<?php
 
-endif; 
+endif;
 
 do_action('admin_notices');