Changeset 6558

Timestamp:

01/05/08 00:17:35 (9 months ago)

Author:

matt

Message:

Put menus in their proper place. TODO: refactor.

Files:

• trunk/wp-admin/menu-header.php (modified) (2 diffs)
• trunk/wp-admin/menu.php (modified) (1 diff)

trunk/wp-admin/menu-header.php

@@ -60 +60 @@
-    }
-}
+
+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
+    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]}") || !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='{$item[2]}'$class>{$item[0]}</a></li>";
+    }
+}
+
-do_action( 'adminmenu' );
-?>
@@ -67 +92 @@
-<?php
-foreach ( $menu as $key => $item ) {
-) // get each menu item before 3
+|| $key > 40 )
-        continue;
-

trunk/wp-admin/menu.php

@@ -19 +19 @@
-if ( 100 < $awaiting_mod )
-    $awaiting_mod = '99+'; // to not blow out layout
- sprintf( __('Comments %s'), "<span id='awaiting-mod' class='comment-count'>$awaiting_mod</span>" ), 'edit_posts', 'edit-comment
-5] = array(__('Design'), 'switch_themes', 'theme
+__('Design'), 'switch_themes', 'theme
+0] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='comment-count'>$awaiting_mod</span>" ), 'edit_posts', 'edit-comment
-$menu[30] = array(__('Plugins'), 'activate_plugins', 'plugins.php');
-if ( current_user_can('edit_users') )