WordPress 4.4.1-scripts

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

diff --git a/wp-admin/includes/menu.php b/wp-admin/includes/menu.php
index 6835091a700aaa8e977e5bd6f4a296dd0742204d..74804022b7034b607256046e6fed685e356e193c 100644 (file)
--- a/wp-admin/includes/menu.php
+++ b/wp-admin/includes/menu.php
@@ -71,22 +71,19 @@ unset($menu_page, $compat);
 $_wp_submenu_nopriv = array();
 $_wp_menu_nopriv = array();
 // Loop over submenus and remove pages for which the user does not have privs.
 $_wp_submenu_nopriv = array();
 $_wp_menu_nopriv = array();
 // Loop over submenus and remove pages for which the user does not have privs.

-foreach ( array( 'submenu' ) as $sub_loop ) {
-       foreach ($$sub_loop as $parent => $sub) {
-               foreach ($sub as $index => $data) {
-                       if ( ! current_user_can($data[1]) ) {
-                               unset(${$sub_loop}[$parent][$index]);
-                               $_wp_submenu_nopriv[$parent][$data[2]] = true;
-                       }
+foreach ($submenu as $parent => $sub) {
+       foreach ($sub as $index => $data) {
+               if ( ! current_user_can($data[1]) ) {
+                       unset($submenu[$parent][$index]);
+                       $_wp_submenu_nopriv[$parent][$data[2]] = true;

                }
                }

-               unset($index, $data);
-
-               if ( empty(${$sub_loop}[$parent]) )
-                       unset(${$sub_loop}[$parent]);

        }
        }

-       unset($sub, $parent);
+       unset($index, $data);
+
+       if ( empty($submenu[$parent]) )
+               unset($submenu[$parent]);

 }
 }

-unset($sub_loop);
+unset($sub, $parent);

 
 /*
  * Loop over the top-level menu.
 
 /*
  * Loop over the top-level menu.


@@ -97,11 +94,13 @@ foreach ( $menu as $id => $data ) {
        if ( empty($submenu[$data[2]]) )
                continue;
        $subs = $submenu[$data[2]];
        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];
        $old_parent = $data[2];
        $new_parent = $first_sub[2];

-       // If the first submenu is not the same as the assigned parent,
-       // make the first submenu the new parent.
+       /*
+        * If the first submenu is not the same as the assigned parent,
+        * make the first submenu the new parent.
+        */

        if ( $new_parent != $old_parent ) {
                $_wp_real_parent_file[$old_parent] = $new_parent;
                $menu[$id][2] = $new_parent;
        if ( $new_parent != $old_parent ) {
                $_wp_real_parent_file[$old_parent] = $new_parent;
                $menu[$id][2] = $new_parent;


@@ -164,7 +163,7 @@ foreach ( $menu as $id => $data ) {
         */
        if ( ! empty( $submenu[$data[2]] ) && 1 == count ( $submenu[$data[2]] ) ) {
                $subs = $submenu[$data[2]];
         */
        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]] );
        }
                if ( $data[2] == $first_sub[2] )
                        unset( $submenu[$data[2]] );
        }


@@ -179,29 +178,23 @@ foreach ( $menu as $id => $data ) {
 }
 unset($id, $data, $subs, $first_sub);
 
 }
 unset($id, $data, $subs, $first_sub);
 

-// Remove any duplicated separators
-$separator_found = false;
-foreach ( $menu as $id => $data ) {
-       if ( 0 == strcmp('wp-menu-separator', $data[4] ) ) {
-               if (false == $separator_found) {
-                       $separator_found = true;
-               } else {
-                       unset($menu[$id]);
-                       $separator_found = false;
-               }
-       } else {
-               $separator_found = false;
-       }
-}
-unset($id, $data);
-
+/**
+ *
+ * @param string $add
+ * @param string $class
+ * @return string
+ */

 function add_cssclass($add, $class) {
        $class = empty($class) ? $add : $class .= ' ' . $add;
        return $class;
 }
 
 function add_cssclass($add, $class) {
        $class = empty($class) ? $add : $class .= ' ' . $add;
        return $class;
 }
 

+/**
+ *
+ * @param array $menu
+ * @return array
+ */

 function add_menu_classes($menu) {
 function add_menu_classes($menu) {

-

        $first = $lastorder = false;
        $i = 0;
        $mc = count($menu);
        $first = $lastorder = false;
        $i = 0;
        $mc = count($menu);


@@ -250,7 +243,7 @@ uksort($menu, "strnatcasecmp"); // make it all pretty
 /**
  * Filter whether to enable custom ordering of the administration menu.
  *
 /**
  * Filter whether to enable custom ordering of the administration menu.
  *

- * See the 'menu_order' filter for reordering menu items.
+ * See the {@see 'menu_order'} filter for reordering menu items.

  *
  * @since 2.8.0
  *
  *
  * @since 2.8.0
  *


@@ -267,7 +260,7 @@ if ( apply_filters( 'custom_menu_order', false ) ) {
        /**
         * Filter the order of administration menu items.
         *
        /**
         * Filter the order of administration menu items.
         *

-        * A truthy value must first be passed to the 'custom_menu_order' filter
+        * A truthy value must first be passed to the {@see 'custom_menu_order'} filter

         * for this filter to work. Use the following to enable custom menu ordering:
         *
         *     add_filter( 'custom_menu_order', '__return_true' );
         * for this filter to work. Use the following to enable custom menu ordering:
         *
         *     add_filter( 'custom_menu_order', '__return_true' );


@@ -280,6 +273,15 @@ if ( apply_filters( 'custom_menu_order', false ) ) {
        $menu_order = array_flip($menu_order);
        $default_menu_order = array_flip($default_menu_order);
 
        $menu_order = array_flip($menu_order);
        $default_menu_order = array_flip($default_menu_order);
 

+       /**
+        *
+        * @global array $menu_order
+        * @global array $default_menu_order
+        *
+        * @param array $a
+        * @param array $b
+        * @return int
+        */

        function sort_menu($a, $b) {
                global $menu_order, $default_menu_order;
                $a = $a[2];
        function sort_menu($a, $b) {
                global $menu_order, $default_menu_order;
                $a = $a[2];


@@ -301,6 +303,26 @@ if ( apply_filters( 'custom_menu_order', false ) ) {
        unset($menu_order, $default_menu_order);
 }
 
        unset($menu_order, $default_menu_order);
 }
 

+// Prevent adjacent separators
+$prev_menu_was_separator = false;
+foreach ( $menu as $id => $data ) {
+       if ( false === stristr( $data[4], 'wp-menu-separator' ) ) {
+
+               // This item is not a separator, so falsey the toggler and do nothing
+               $prev_menu_was_separator = false;
+       } else {
+
+               // The previous item was a separator, so unset this one
+               if ( true === $prev_menu_was_separator ) {
+                       unset( $menu[ $id ] );
+               }
+
+               // This item is a separator, so truthy the toggler and move on
+               $prev_menu_was_separator = true;
+       }
+}
+unset( $id, $data, $prev_menu_was_separator );
+

 // Remove the last menu item if it is a separator.
 $last_menu_key = array_keys( $menu );
 $last_menu_key = array_pop( $last_menu_key );
 // Remove the last menu item if it is a separator.
 $last_menu_key = array_keys( $menu );
 $last_menu_key = array_pop( $last_menu_key );


@@ -317,7 +339,7 @@ if ( !user_can_access_admin_page() ) {
         */
        do_action( 'admin_page_access_denied' );
 
         */
        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);
 }
 
 $menu = add_menu_classes($menu);