From ab8822bdcd7ecf44adfd9b7ccc7a1fa74bb6717f Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Sun, 4 Jan 2009 04:29:28 +0000 Subject: [PATCH] Cast to array to silence warnings from plugin added menus, props DD32, fixes #8782 git-svn-id: https://develop.svn.wordpress.org/trunk@10293 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/plugin.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 158860a2e0..7333f26e42 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -623,7 +623,7 @@ function add_submenu_page( $parent, $page_title, $menu_title, $access_level, $fi // parent file someone is trying to link back to the parent manually. In // this case, don't automatically add a link back to avoid duplication. if (!isset( $submenu[$parent] ) && $file != $parent ) { - foreach ( $menu as $parent_menu ) { + foreach ( (array)$menu as $parent_menu ) { if ( $parent_menu[2] == $parent && current_user_can( $parent_menu[1] ) ) $submenu[$parent][] = $parent_menu; } @@ -721,7 +721,7 @@ function get_admin_page_parent( $parent = '' ) { */ if ( $pagenow == 'admin.php' && isset( $plugin_page ) ) { - foreach ( $menu as $parent_menu ) { + foreach ( (array)$menu as $parent_menu ) { if ( $parent_menu[2] == $plugin_page ) { $parent_file = $plugin_page; if ( isset( $_wp_real_parent_file[$parent_file] ) ) @@ -744,7 +744,7 @@ function get_admin_page_parent( $parent = '' ) { return $parent_file; } - foreach (array_keys( $submenu ) as $parent) { + foreach (array_keys( (array)$submenu ) as $parent) { foreach ( $submenu[$parent] as $submenu_array ) { if ( isset( $_wp_real_parent_file[$parent] ) ) $parent = $_wp_real_parent_file[$parent]; @@ -780,7 +780,7 @@ function get_admin_page_title() { $parent = $parent1 = get_admin_page_parent(); if ( empty ( $parent) ) { - foreach ( $menu as $menu_array ) { + foreach ( (array)$menu as $menu_array ) { if ( isset( $menu_array[3] ) ) { if ( $menu_array[2] == $pagenow ) { $title = $menu_array[3];