From 2677205fba129d3b945fab5d50e3dc5e7f1e2d35 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Fri, 26 Oct 2012 04:17:25 +0000 Subject: [PATCH] If we have not yet initialized the custom header/background, do not do extra removal in _remove_theme_support(). fixes #22246. git-svn-id: http://core.svn.wordpress.org/trunk@22313 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/theme.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wp-includes/theme.php b/wp-includes/theme.php index 5992ff17a4..63e6e0a883 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -1463,6 +1463,8 @@ function _remove_theme_support( $feature ) { switch ( $feature ) { case 'custom-header' : + if ( false === did_action( 'wp_loaded', '_custom_header_background_just_in_time' ) ) + break; $support = get_theme_support( 'custom-header' ); if ( $support[0]['wp-head-callback'] ) remove_action( 'wp_head', $support[0]['wp-head-callback'] ); @@ -1471,6 +1473,8 @@ function _remove_theme_support( $feature ) { break; case 'custom-background' : + if ( false === did_action( 'wp_loaded', '_custom_header_background_just_in_time' ) ) + break; $support = get_theme_support( 'custom-background' ); remove_action( 'wp_head', $support[0]['wp-head-callback'] ); remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );