WordPress.org

Make WordPress Core

Changeset 22312


Ignore:
Timestamp:
10/26/12 04:16:49 (3 years ago)
Author:
nacin
Message:

Revert [22274]. see #22246.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/theme.php

    r22274 r22312  
    14651465        case 'custom-header' : 
    14661466            $support = get_theme_support( 'custom-header' ); 
    1467             if ( isset( $support[0]['wp-head-callback'] ) ) 
     1467            if ( $support[0]['wp-head-callback'] ) 
    14681468                remove_action( 'wp_head', $support[0]['wp-head-callback'] ); 
    1469             if ( isset( $GLOBALS['custom_image_header'] ) ) { 
    1470                 remove_action( 'admin_menu', array( $GLOBALS['custom_image_header'], 'init' ) ); 
    1471                 unset( $GLOBALS['custom_image_header'] ); 
    1472             } 
     1469            remove_action( 'admin_menu', array( $GLOBALS['custom_image_header'], 'init' ) ); 
     1470            unset( $GLOBALS['custom_image_header'] ); 
    14731471            break; 
    14741472 
    14751473        case 'custom-background' : 
    14761474            $support = get_theme_support( 'custom-background' ); 
    1477             if ( isset( $support[0]['wp-head-callback'] ) ) 
    1478                 remove_action( 'wp_head', $support[0]['wp-head-callback'] ); 
    1479             if ( isset( $GLOBALS['custom_background'] ) ) { 
    1480                 remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) ); 
    1481                 unset( $GLOBALS['custom_background'] ); 
    1482             } 
     1475            remove_action( 'wp_head', $support[0]['wp-head-callback'] ); 
     1476            remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) ); 
     1477            unset( $GLOBALS['custom_background'] ); 
    14831478            break; 
    14841479    } 
Note: See TracChangeset for help on using the changeset viewer.