Changeset 12738

Timestamp:

01/16/2010 10:59:27 PM (17 years ago)

Author:

westi

Message:

Ensure that inaccessible parent menus are marked as such even if they have accessible children. See #11922.

File:

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

trunk/wp-admin/menu.php

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