From 740b92853de99125d3c4364b803d969135a5bb50 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Fri, 12 Jun 2015 17:29:26 +0000 Subject: [PATCH] `WP_Customize_Setting::is_current_blog_previewed()` should only return `false`, not `false` or `void`. The one invocation of the method only loosely checks the return value. See #32444. Built from https://develop.svn.wordpress.org/trunk@32732 git-svn-id: http://core.svn.wordpress.org/trunk@32703 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-customize-setting.php | 4 ++-- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/class-wp-customize-setting.php b/wp-includes/class-wp-customize-setting.php index 64693a2595..e37bb65de8 100644 --- a/wp-includes/class-wp-customize-setting.php +++ b/wp-includes/class-wp-customize-setting.php @@ -129,11 +129,11 @@ class WP_Customize_Setting { * @since 4.2.0 * @access public * - * @return bool|void If preview() has been called. + * @return bool If preview() has been called. */ public function is_current_blog_previewed() { if ( ! isset( $this->_previewed_blog_id ) ) { - return; + return false; } return ( get_current_blog_id() === $this->_previewed_blog_id ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 4e9c851258..5277cac0eb 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32731'; +$wp_version = '4.3-alpha-32732'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.