Changeset 18109

Timestamp:

06/01/2011 09:27:42 PM (13 years ago)

Author:

ryan

Message:

Use array_pop( array_keys() ) instead of end() to find the end of the array. end() finds that last item added, which is not reliable with plugins that add items to the end and then sort them up with custom_menu_order. see #17629

File:

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

trunk/wp-admin/includes/menu.php

@@ -216 +216 @@
 
 // Remove the last menu item if it is a separator.
-$last_menu_item = end( $menu );
-if ( 'wp-menu-separator' == $last_menu_item[ 4 ] )
-    array_pop( $menu );
-reset( $menu );
-unset( $last_menu_item );
+$last_menu_key = array_pop( array_keys( $menu ) );
+if ( 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] )
+    unset( $menu[ $last_menu_key ] );
+unset( $last_menu_key );
 
 if ( !user_can_access_admin_page() ) {