Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-12 13:44:21 +01:00
Code Issues Projects Releases Wiki Activity

If we have not yet initialized the custom header/background, do not do extra removal in _remove_theme_support(). fixes #22246.

Browse Source 
git-svn-id: http://core.svn.wordpress.org/trunk@22313 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2012-10-26 04:17:25 +00:00
parent 602dd1a738
commit 2677205fba
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/theme.php
View File

@ -1463,6 +1463,8 @@ function _remove_theme_support( $feature ) {
switch ( $feature ) { switch ( $feature ) {
case 'custom-header' : case 'custom-header' :
if ( false === did_action( 'wp_loaded', '_custom_header_background_just_in_time' ) )
break;
$support = get_theme_support( 'custom-header' ); $support = get_theme_support( 'custom-header' );
if ( $support[0]['wp-head-callback'] ) if ( $support[0]['wp-head-callback'] )
remove_action( 'wp_head', $support[0]['wp-head-callback'] ); remove_action( 'wp_head', $support[0]['wp-head-callback'] );
@ -1471,6 +1473,8 @@ function _remove_theme_support( $feature ) {
break; break;
case 'custom-background' : case 'custom-background' :
if ( false === did_action( 'wp_loaded', '_custom_header_background_just_in_time' ) )
break;
$support = get_theme_support( 'custom-background' ); $support = get_theme_support( 'custom-background' );
remove_action( 'wp_head', $support[0]['wp-head-callback'] ); remove_action( 'wp_head', $support[0]['wp-head-callback'] );
remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) ); remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );