From 137204b0337a18df7a5628ba14eb27ac0d9971e2 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 7 Feb 2015 17:57:24 +0000 Subject: [PATCH] In `_wp_menu_output()`, `$submenu_items` is an array and should be initialized as such. props ipm-frommen. fixes #31257. Built from https://develop.svn.wordpress.org/trunk@31364 git-svn-id: http://core.svn.wordpress.org/trunk@31345 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/menu-header.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php index c599fd1be8..8aa81fe3e5 100644 --- a/wp-admin/menu-header.php +++ b/wp-admin/menu-header.php @@ -60,7 +60,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) { $first = false; } - $submenu_items = false; + $submenu_items = array(); if ( ! empty( $submenu[$item[2]] ) ) { $class[] = 'wp-has-submenu'; $submenu_items = $submenu[$item[2]]; diff --git a/wp-includes/version.php b/wp-includes/version.php index 12ec328691..11f1ad9bec 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31363'; +$wp_version = '4.2-alpha-31364'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.