Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Cast to array to silence warnings from plugin added menus, props DD32, fixes #8782

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@10293 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-01-04 04:29:28 +00:00
parent 9caa0dc079
commit 6d1a60e14c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/includes/plugin.php
View File

@ -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 // 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. // this case, don't automatically add a link back to avoid duplication.
if (!isset( $submenu[$parent] ) && $file != $parent ) { 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] ) ) if ( $parent_menu[2] == $parent && current_user_can( $parent_menu[1] ) )
$submenu[$parent][] = $parent_menu; $submenu[$parent][] = $parent_menu;
} }
@ -721,7 +721,7 @@ function get_admin_page_parent( $parent = '' ) {
*/ */
if ( $pagenow == 'admin.php' && isset( $plugin_page ) ) { if ( $pagenow == 'admin.php' && isset( $plugin_page ) ) {
foreach ( $menu as $parent_menu ) { foreach ( (array)$menu as $parent_menu ) {
if ( $parent_menu[2] == $plugin_page ) { if ( $parent_menu[2] == $plugin_page ) {
$parent_file = $plugin_page; $parent_file = $plugin_page;
if ( isset( $_wp_real_parent_file[$parent_file] ) ) if ( isset( $_wp_real_parent_file[$parent_file] ) )
@ -744,7 +744,7 @@ function get_admin_page_parent( $parent = '' ) {
return $parent_file; return $parent_file;
} }
foreach (array_keys( $submenu ) as $parent) { foreach (array_keys( (array)$submenu ) as $parent) {
foreach ( $submenu[$parent] as $submenu_array ) { foreach ( $submenu[$parent] as $submenu_array ) {
if ( isset( $_wp_real_parent_file[$parent] ) ) if ( isset( $_wp_real_parent_file[$parent] ) )
$parent = $_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(); $parent = $parent1 = get_admin_page_parent();
if ( empty ( $parent) ) { if ( empty ( $parent) ) {
foreach ( $menu as $menu_array ) { foreach ( (array)$menu as $menu_array ) {
if ( isset( $menu_array[3] ) ) { if ( isset( $menu_array[3] ) ) {
if ( $menu_array[2] == $pagenow ) { if ( $menu_array[2] == $pagenow ) {
$title = $menu_array[3]; $title = $menu_array[3];