Index: wp-content/themes/twentyten/functions.php =================================================================== --- wp-content/themes/twentyten/functions.php (revision 20220) +++ wp-content/themes/twentyten/functions.php (working copy) @@ -101,34 +101,27 @@ ) ); // This theme allows users to set a custom background - add_custom_background(); + add_theme_support('custom-background', array('callback' => '')); // Your changeable header business starts here - if ( ! defined( 'HEADER_TEXTCOLOR' ) ) - define( 'HEADER_TEXTCOLOR', '' ); + $header_args = array( + 'random-default' => false, + 'height' => 198, + 'width' => 940, + 'header-text' => false, + 'default-image' => '%s/images/headers/path.jpg', + 'callback' => '', + 'admin-header-callback' => 'twentyten_admin_header_style', + ); + add_theme_support( 'custom-header', $header_args ); - // No CSS, just IMG call. The %s is a placeholder for the theme template directory URI. - if ( ! defined( 'HEADER_IMAGE' ) ) - define( 'HEADER_IMAGE', '%s/images/headers/path.jpg' ); - // The height and width of your custom header. You can hook into the theme's own filters to change these values. - // Add a filter to twentyten_header_image_width and twentyten_header_image_height to change these values. - define( 'HEADER_IMAGE_WIDTH', apply_filters( 'twentyten_header_image_width', 940 ) ); - define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyten_header_image_height', 198 ) ); - // We'll be using post thumbnails for custom header images on posts and pages. // We want them to be 940 pixels wide by 198 pixels tall. // Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php. - set_post_thumbnail_size( HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true ); + set_post_thumbnail_size( get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ), true ); - // Don't support text inside the header image. - if ( ! defined( 'NO_HEADER_TEXT' ) ) - define( 'NO_HEADER_TEXT', true ); - // Add a way for the custom header to be styled in the admin panel that controls - // custom headers. See twentyten_admin_header_style(), below. - add_custom_image_header( '', 'twentyten_admin_header_style' ); - // ... and thus ends the changeable header business. // Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI. Index: wp-content/themes/twentyeleven/functions.php =================================================================== --- wp-content/themes/twentyeleven/functions.php (revision 20220) +++ wp-content/themes/twentyeleven/functions.php (working copy) @@ -62,10 +62,8 @@ * * @uses load_theme_textdomain() For translation/localization support. * @uses add_editor_style() To style the visual editor. - * @uses add_theme_support() To add support for post thumbnails, automatic feed links, and Post Formats. + * @uses add_theme_support() To add support for post thumbnails, automatic feed links, custom backgrounds, and custom image headers, and Post Formats. * @uses register_nav_menus() To add support for navigation menus. - * @uses add_custom_background() To add support for a custom background. - * @uses add_custom_image_header() To add support for a custom header. * @uses register_default_headers() To register the default custom header images provided with the theme. * @uses set_post_thumbnail_size() To set a custom post thumbnail size. * @@ -104,40 +102,39 @@ add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) ); // Add support for custom backgrounds - add_custom_background(); + add_theme_support('custom-background', array('callback' => '')); // This theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images add_theme_support( 'post-thumbnails' ); - // The next four constants set how Twenty Eleven supports custom headers. - - // The default header text color - define( 'HEADER_TEXTCOLOR', '000' ); - - // By leaving empty, we allow for random image rotation. - define( 'HEADER_IMAGE', '' ); - - // The height and width of your custom header. - // Add a filter to twentyeleven_header_image_width and twentyeleven_header_image_height to change these values. - define( 'HEADER_IMAGE_WIDTH', apply_filters( 'twentyeleven_header_image_width', 1000 ) ); - define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyeleven_header_image_height', 288 ) ); - // We'll be using post thumbnails for custom header images on posts and pages. // We want them to be the size of the header image that we just defined // Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php. - set_post_thumbnail_size( HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true ); + set_post_thumbnail_size( get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ), true ); // Add Twenty Eleven's custom image sizes - add_image_size( 'large-feature', HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true ); // Used for large feature (header) images + add_image_size( + 'large-feature', + get_theme_support( 'custom-header', 'width' ), + get_theme_support( 'custom-header', 'height' ), + true + ); // Used for large feature (header) images + add_image_size( 'small-feature', 500, 300 ); // Used for featured posts if a large-feature doesn't exist + // Add support for custom headers // Turn on random header image rotation by default. - add_theme_support( 'custom-header', array( 'random-default' => true ) ); + add_theme_support( 'custom-header', array( + 'default-image' => '', + 'random-default' => true, + 'width' => 1000, + 'height' => 288, + 'default-text-color' => '000', + 'callback' => 'twentyeleven_header_style', + 'admin-header-callback' => 'twentyeleven_admin_header_style', + 'admin-image-div-callback' => 'twentyeleven_admin_header_image', + ) ); - // Add a way for the custom header to be styled in the admin panel that controls - // custom headers. See twentyeleven_admin_header_style(), below. - add_custom_image_header( 'twentyeleven_header_style', 'twentyeleven_admin_header_style', 'twentyeleven_admin_header_image' ); - // ... and thus ends the changeable header business. // Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI. @@ -203,8 +200,8 @@ function twentyeleven_header_style() { // If no custom options for text are set, let's bail - // get_header_textcolor() options: HEADER_TEXTCOLOR is default, hide text (returns 'blank') or any hex value - if ( HEADER_TEXTCOLOR == get_header_textcolor() ) + // get_header_textcolor() options: get_theme_support( 'custom-header', 'default-text-color' ) is default, hide text (returns 'blank') or any hex value + if ( get_theme_support( 'custom-header', 'default-text-color' ) == get_header_textcolor() ) return; // If we get this far, we have custom styles. Let's do this. ?> @@ -237,7 +234,7 @@ /** * Styles the header image displayed on the Appearance > Header admin panel. * - * Referenced via add_custom_image_header() in twentyeleven_setup(). + * Referenced via add_theme_support() in twentyeleven_setup(). * * @since Twenty Eleven 1.0 */ @@ -266,7 +263,7 @@ } #site-title a, #site-description { @@ -287,17 +284,17 @@ /** * Custom header image markup displayed on the Appearance > Header admin panel. * - * Referenced via add_custom_image_header() in twentyeleven_setup(). + * Referenced via add_theme_support() in twentyeleven_setup(). * * @since Twenty Eleven 1.0 */ function twentyeleven_admin_header_image() { ?>

onclick="return false;" href="">

>