Merged with WordPress 2.5, unstable, only for testing

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 98 insertions, 2 deletions

diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index f6a3b7d..4c0ca13 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -1,4 +1,3 @@
-<ul id="adminmenu">
 <?php
 $self = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);
 $self = preg_replace('|^.*/plugins/|i', '', $self);
@@ -6,7 +5,68 @@ $self = preg_replace('|^.*/mu-plugins/|i', '', $self);
 
 get_admin_page_parent();
 
-foreach ($menu as $item) {
+// We're going to do this loop three times
+?>
+
+<ul id="dashmenu">
+<?php
+foreach ( $menu as $key => $item ) {
+	if ( 3 < $key ) // get each menu item before 3
+		continue;
+	$class = '';
+	// 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]]) ) {
+		$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]}") || file_exists(ABSPATH . MUPLUGINDIR . "/{$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]) ) {
+		$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
+		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") || file_exists(ABSPATH . MUPLUGINDIR . "/{$item[2]}") || !empty($menu_hook))
+			echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
+		else
+			echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
+	}
+}
+do_action( 'dashmenu' );
+?>
+</ul>
+
+<ul id="adminmenu">
+<?php
+foreach ( $menu as $key => $item ) {
+	if ( 5 > $key || $key > 25 ) // get each menu item before 3
+		continue;
+
+	$class = '';
+
+	// 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]]) ) {
+		$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]}") || file_exists(ABSPATH . MUPLUGINDIR . "/{$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]) ) {
+		$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
+		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") || file_exists(ABSPATH . MUPLUGINDIR . "/{$item[2]}") || !empty($menu_hook))
+			echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
+		else
+			echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>";
+	}
+}
+
+foreach ( $menu as $key => $item ) {
+	if ( $key < 41 ) // there is a more efficient way to do this!
+		continue;
+
 	$class = '';
 
 	// 0 = name, 1 = capability, 2 = file
@@ -20,6 +80,7 @@ foreach ($menu as $item) {
 		else
 			echo "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a></li>";
 	} else if ( current_user_can($item[1]) ) {
+		$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
 		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") || file_exists(ABSPATH . MUPLUGINDIR . "/{$item[2]}") )
 			echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
 		else
@@ -27,9 +88,44 @@ foreach ($menu as $item) {
 	}
 }
 
+do_action( 'adminmenu' );
+?>
+</ul>
+
+<ul id="sidemenu">
+<?php
+$side_items = array();
+foreach ( $menu as $key => $item ) {
+	if ( 26 > $key || $key > 40 )
+		continue;
+
+	$class = '';
+
+	// 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]]) ) {
+		$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 . "/{$item[2]}") || file_exists(ABSPATH . MUPLUGINDIR . "/{$item[2]}") )
+			$side_items[] = "\n\t<li><a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
+		else
+			$side_items[] = "\n\t<li><a href='{$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
+	} else if ( current_user_can($item[1]) ) {
+		$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
+		if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") || file_exists(ABSPATH . MUPLUGINDIR . "/{$item[2]}") )
+			$side_items[] = "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a>";
+		else
+			$side_items[] = "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a>";
+	}
+}
+echo implode(' </li>', $side_items) . '</li>';
+unset($side_items);
+do_action( 'sidemenu' );
 ?>
 </ul>
 
+
 <?php
 // Sub-menu
 if ( isset($submenu["$parent_file"]) ) :