Changeset 22274

Timestamp:

10/23/2012 01:20:40 PM (12 years ago)

Author:

ryan

Message:

Avoid notices in _remove_theme_support(). Props alex-ye, SergeyBiryukov. fixes #22246

File:

• trunk/wp-includes/theme.php (modified) (1 diff)

trunk/wp-includes/theme.php

@@ -1465 +1465 @@
         case 'custom-header' :
             $support = get_theme_support( 'custom-header' );
-            if ( $support[0]['wp-head-callback'] )
+            if ( isset( $support[0]['wp-head-callback'] ) )
                 remove_action( 'wp_head', $support[0]['wp-head-callback'] );
-            remove_action( 'admin_menu', array( $GLOBALS['custom_image_header'], 'init' ) );
-            unset( $GLOBALS['custom_image_header'] );
+            if ( isset( $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' );
-            remove_action( 'wp_head', $support[0]['wp-head-callback'] );
-            remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );
-            unset( $GLOBALS['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'] );
+            }
             break;
     }