From 556332cee8d567621d9edc23a7eec99e0dacd5c0 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Fri, 26 Oct 2012 04:16:49 +0000 Subject: [PATCH] Revert [22274]. see #22246. git-svn-id: https://develop.svn.wordpress.org/trunk@22312 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/theme.php | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/wp-includes/theme.php b/wp-includes/theme.php index 5c677a93fd..5992ff17a4 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -1464,22 +1464,17 @@ function _remove_theme_support( $feature ) { switch ( $feature ) { case 'custom-header' : $support = get_theme_support( 'custom-header' ); - if ( isset( $support[0]['wp-head-callback'] ) ) + if ( $support[0]['wp-head-callback'] ) remove_action( 'wp_head', $support[0]['wp-head-callback'] ); - if ( isset( $GLOBALS['custom_image_header'] ) ) { - remove_action( 'admin_menu', array( $GLOBALS['custom_image_header'], 'init' ) ); - unset( $GLOBALS['custom_image_header'] ); - } + remove_action( 'admin_menu', array( $GLOBALS['custom_image_header'], 'init' ) ); + unset( $GLOBALS['custom_image_header'] ); break; case 'custom-background' : $support = get_theme_support( 'custom-background' ); - if ( isset( $support[0]['wp-head-callback'] ) ) - remove_action( 'wp_head', $support[0]['wp-head-callback'] ); - if ( isset( $GLOBALS['custom_background'] ) ) { - remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) ); - unset( $GLOBALS['custom_background'] ); - } + remove_action( 'wp_head', $support[0]['wp-head-callback'] ); + remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) ); + unset( $GLOBALS['custom_background'] ); break; }