From 6f9f33e39929202cfe82187ebacdd84956b5dc00 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 21 Mar 2012 22:21:22 +0000
Subject: [PATCH] Only pass arguments from the deprecated
 add_custom_background() or add_custom_image_header() to add_theme_support()
 if the argument was actually supplied. With [20212], default argument values
 (like wp-head-callback=_custom_background_cb) only work for arguments that
 were not explicitly set, so don't set empty values. see #20249.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20246 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/deprecated.php | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index 1a8d414765..48d6adf5c7 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -2996,11 +2996,14 @@ function get_current_theme() {
  */
 function add_custom_image_header( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
 	_deprecated_function( __FUNCTION__, '3.4', 'add_theme_support( \'custom-header\', $args )' );
-	return add_theme_support( 'custom-header', array(
-		'wp-head-callback' => $wp_head_callback,
-		'admin-head-callback' => $admin_head_callback,
-		'admin-preview-callback' => $admin_preview_callback,
-	) );
+	$args = array();
+	if ( $wp_head_callback )
+		$args['wp-head-callback'] = $wp_head_callback;
+	if ( $admin_head_callback )
+		$args['admin-head-callback'] = $admin_head_callback;
+	if ( $admin_preview_callback )
+		$args['admin-preview-callback'] = $admin_preview_callback;
+	return add_theme_support( 'custom-background', $args );
 }
 
 /**
@@ -3032,12 +3035,14 @@ function remove_custom_image_header() {
  */
 function add_custom_background( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
 	_deprecated_function( __FUNCTION__, '3.4', 'add_theme_support( \'custom-background\', $args )' );
-
-	return add_theme_support( 'custom-background', array(
-		'wp-head-callback' => $wp_head_callback,
-		'admin-head-callback' => $admin_head_callback,
-		'admin-preview-callback' => $admin_preview_callback,
-	) );
+	$args = array();
+	if ( $wp_head_callback )
+		$args['wp-head-callback'] = $wp_head_callback;
+	if ( $admin_head_callback )
+		$args['admin-head-callback'] = $admin_head_callback;
+	if ( $admin_preview_callback )
+		$args['admin-preview-callback'] = $admin_preview_callback;
+	return add_theme_support( 'custom-background', $args );
 }
 
 /**