WordPress 4.2

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

diff --git a/wp-admin/includes/menu.php b/wp-admin/includes/menu.php
index 873f7379d9eb4c534dae23d2346ef05320c7dff1..ce90c1ba3c103e1ab24064523c6e98d9736a51c9 100644 (file)
--- a/wp-admin/includes/menu.php
+++ b/wp-admin/includes/menu.php
@@ -94,7 +94,7 @@ foreach ( $menu as $id => $data ) {
        if ( empty($submenu[$data[2]]) )
                continue;
        $subs = $submenu[$data[2]];
-       $first_sub = array_shift($subs);
+       $first_sub = reset( $subs );
        $old_parent = $data[2];
        $new_parent = $first_sub[2];
        /*
@@ -163,7 +163,7 @@ foreach ( $menu as $id => $data ) {
         */
        if ( ! empty( $submenu[$data[2]] ) && 1 == count ( $submenu[$data[2]] ) ) {
                $subs = $submenu[$data[2]];
-               $first_sub = array_shift($subs);
+               $first_sub = reset( $subs );
                if ( $data[2] == $first_sub[2] )
                        unset( $submenu[$data[2]] );
        }
@@ -316,7 +316,7 @@ if ( !user_can_access_admin_page() ) {
         */
        do_action( 'admin_page_access_denied' );
 
-       wp_die( __('You do not have sufficient permissions to access this page.') );
+       wp_die( __( 'You do not have sufficient permissions to access this page.' ), 403 );
 }
 
 $menu = add_menu_classes($menu);