Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

Screen API: After [37972], ensure that $box['args'] is an array before trying to access __widget_basename.

Browse Source 
This prevents a PHP fatal error on the Nav Menus screen where `$args` is an object.

Props elrae.
Fixes #35021.
Built from https://develop.svn.wordpress.org/trunk@38004


git-svn-id: http://core.svn.wordpress.org/trunk@37945 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-07-07 16:39:29 +00:00
parent 7b5cd0c021
commit 30420b7d19
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/includes/screen.php
View File

@ -120,7 +120,7 @@ function meta_box_prefs( $screen ) {
$widget_title = $box['title'];
if ( isset( $box['args']['__widget_basename'] ) ) {
if ( is_array( $box['args'] ) && isset( $box['args']['__widget_basename'] ) ) {
$widget_title = $box['args']['__widget_basename'];
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6-beta2-38003';
$wp_version = '4.6-beta2-38004';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.