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

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
This commit is contained in:
Scott Taylor 2014-11-03 05:15:22 +00:00
parent a14a4fc9a5
commit 0eb038d97b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/custom-header.php
View File

@ -60,6 +60,11 @@ class Custom_Image_Header {
*/ */
private $page = ''; private $page = '';
/**
* @var bool
*/
private $updated;
/** /**
* Constructor - Register administration header callback. * Constructor - Register administration header callback.
* *
@ -300,9 +305,6 @@ class Custom_Image_Header {
public function process_default_headers() { public function process_default_headers() {
global $_wp_default_headers; global $_wp_default_headers;
if ( !empty($this->headers) )
return;
if ( !isset($_wp_default_headers) ) if ( !isset($_wp_default_headers) )
return; return;

2
wp-includes/version.php
View File

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