Ticket #22246: 22246.diff

wp-includes/theme.php

@@ -1463 +1463 @@
 
         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 +1473 @@
                         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' ) );