Changeset 20246

Timestamp:

03/21/2012 10:21:22 PM (15 years ago)

Author:

nacin

Message:

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.

File:

• trunk/wp-includes/deprecated.php (modified) (2 diffs)

trunk/wp-includes/deprecated.php

@@ -2997 +2997 @@
 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 );
 }
 
@@ -3033 +3036 @@
 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 );
 }