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

Customize: Fix PHP notice when calling `WP_Customize_Control::json()` inside `content_template()` method. 

A `temp` control is instantiated when `WP_Customize_Manager:: render_control_templates()` is called. This control needs to explicitly specify an empty settings array to avoid trying to use a `temp` setting which won't exist.

See #35926.
See #29572.

Built from https://develop.svn.wordpress.org/trunk@36776


git-svn-id: http://core.svn.wordpress.org/trunk@36743 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Weston Ruter 2016-02-29 07:03:27 +00:00
parent d115144857
commit 53493af312
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/class-wp-customize-manager.php
View File

@ -1401,7 +1401,9 @@ final class WP_Customize_Manager {
*/ */
public function render_control_templates() { public function render_control_templates() {
foreach ( $this->registered_control_types as $control_type ) { foreach ( $this->registered_control_types as $control_type ) {
$control = new $control_type( $this, 'temp', array() ); $control = new $control_type( $this, 'temp', array(
'settings' => array(),
) );
$control->print_template(); $control->print_template();
} }
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-beta1-36775'; $wp_version = '4.5-beta1-36776';
/** /**
* 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.