WordPress 3.7.2

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

diff --git a/wp-admin/includes/menu.php b/wp-admin/includes/menu.php
index fa85e4b5d852afe88f65d060cf09d119384f17de..e315c7666bf8d5402980307c1db22a03ddc38be6 100644 (file)
--- a/wp-admin/includes/menu.php
+++ b/wp-admin/includes/menu.php
@@ -156,7 +156,7 @@ function add_menu_classes($menu) {
                        continue;
                }
 
-               if ( 0 === strpos($top[2], 'separator') ) { // if separator
+               if ( 0 === strpos($top[2], 'separator') && false !== $lastorder ) { // if separator
                        $first = true;
                        $c = $menu[$lastorder][4];
                        $menu[$lastorder][4] = add_cssclass('menu-top-last', $c);
@@ -215,8 +215,9 @@ if ( apply_filters('custom_menu_order', false) ) {
 }
 
 // Remove the last menu item if it is a separator.
-$last_menu_key = array_pop( array_keys( $menu ) );
-if ( 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] )
+$last_menu_key = array_keys( $menu );
+$last_menu_key = array_pop( $last_menu_key );
+if ( !empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] )
        unset( $menu[ $last_menu_key ] );
 unset( $last_menu_key );
 
@@ -226,5 +227,3 @@ if ( !user_can_access_admin_page() ) {
 }
 
 $menu = add_menu_classes($menu);
-
-?>
\ No newline at end of file