X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/0461a5f2e55c8d5f1fde96ca2e83117152573c7d..refs/tags/wordpress-4.0:/wp-admin/includes/menu.php

diff --git a/wp-admin/includes/menu.php b/wp-admin/includes/menu.php
index 6835091a..873f7379 100644
--- 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.
-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.
@@ -100,8 +97,10 @@ foreach ( $menu as $id => $data ) {
 	$first_sub = array_shift($subs);
 	$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;