Changeset 10293

Timestamp:

01/04/2009 04:29:28 AM (16 years ago)

Author:

azaozz

Message:

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

File:

• trunk/wp-admin/includes/plugin.php (modified) (4 diffs)

trunk/wp-admin/includes/plugin.php

@@ -624 +624 @@
     // 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;
@@ -722 +722 @@
 
     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;
@@ -745 +745 @@
     }
 
-    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] ) )
@@ -781 +781 @@
 
     if ( empty ( $parent) ) {
-        foreach ( $menu as $menu_array ) {
+        foreach ( (array)$menu as $menu_array ) {
             if ( isset( $menu_array[3] ) ) {
                 if ( $menu_array[2] == $pagenow ) {