Wordpress 2.9.2

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

diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index cac2be509df422105bd0784c3dc041216c9c47b4..31a876ea8ce82d7e230bca208345afd41db8c3f3 100644 (file)
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -198,11 +198,13 @@ do_action('admin_menu', '');
 // Remove menus that have no accessible submenus and require privs that the user does not have.
 // Run re-parent loop again.
 foreach ( $menu as $id => $data ) {
+       if ( ! current_user_can($data[1]) )
+               $_wp_menu_nopriv[$data[2]] = true;
+
        // If submenu is empty...
        if ( empty($submenu[$data[2]]) ) {
                // And user doesn't have privs, remove menu.
-               if ( ! current_user_can($data[1]) ) {
-                       $_wp_menu_nopriv[$data[2]] = true;
+               if ( isset( $_wp_menu_nopriv[$data[2]] ) ) {
                        unset($menu[$id]);
                }
        }