Changes from trunk/wp-admin/menu.php at r12248 to branches/2.9/wp-admin/menu.php at r12737

File:

• branches/2.9/wp-admin/menu.php (modified) (1 diff)

branches/2.9/wp-admin/menu.php

@@ -199 +199 @@
 // 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]);
                 }