WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2015-02-07 17:57:24 +00:00
parent 1e0905793c
commit 137204b033
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/menu-header.php
View File

@ -60,7 +60,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
$first = false; $first = false;
} }
$submenu_items = false; $submenu_items = array();
if ( ! empty( $submenu[$item[2]] ) ) { if ( ! empty( $submenu[$item[2]] ) ) {
$class[] = 'wp-has-submenu'; $class[] = 'wp-has-submenu';
$submenu_items = $submenu[$item[2]]; $submenu_items = $submenu[$item[2]];

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.