From 0eb038d97b5e392011ebb728644838713f5f52da Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Mon, 3 Nov 2014 05:15:22 +0000 Subject: [PATCH] In `Custom_Image_Header`: * In `->process_default_headers()`, remove check on non-existent `$headers` property. Introduced in [13403]. * Declare `$updated` as a property. See #30224. Built from https://develop.svn.wordpress.org/trunk@30187 git-svn-id: http://core.svn.wordpress.org/trunk@30187 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/custom-header.php | 8 +++++--- wp-includes/version.php | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php index bfa15a046e..6ef81c0870 100644 --- a/wp-admin/custom-header.php +++ b/wp-admin/custom-header.php @@ -60,6 +60,11 @@ class Custom_Image_Header { */ private $page = ''; + /** + * @var bool + */ + private $updated; + /** * Constructor - Register administration header callback. * @@ -300,9 +305,6 @@ class Custom_Image_Header { public function process_default_headers() { global $_wp_default_headers; - if ( !empty($this->headers) ) - return; - if ( !isset($_wp_default_headers) ) return; diff --git a/wp-includes/version.php b/wp-includes/version.php index fb4f5cae1e..d68f8d70e9 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-alpha-30186'; +$wp_version = '4.1-alpha-30187'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.