Changeset 20684

Timestamp:

05/02/2012 03:16:48 PM (13 years ago)

Author:

nacin

Message:

Require both wp-head-callback and admin-head-callback for custom header theme support. fixes #20603.

Location:

trunk/wp-includes

Files:

• deprecated.php (modified) (1 diff)
• theme.php (modified) (2 diffs)

trunk/wp-includes/deprecated.php

@@ -3023 +3023 @@
  * @param callback $admin_preview_callback Output a custom header image div on the custom header administration screen. Optional.
  */
-function add_custom_image_header( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
+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 )' );
-    $args = array();
-    if ( $wp_head_callback )
-        $args['wp-head-callback'] = $wp_head_callback;
-    if ( $admin_head_callback )
-        $args['admin-head-callback'] = $admin_head_callback;
+    $args = array(
+        'wp-head-callback'    => $wp_head_callback,
+        'admin-head-callback' => $admin_head_callback,
+    );
     if ( $admin_preview_callback )
         $args['admin-preview-callback'] = $admin_preview_callback;

trunk/wp-includes/theme.php

@@ -1348 +1348 @@
 
         $args = get_theme_support( 'custom-header' );
-        if ( $args[0]['wp-head-callback'] )
+        if ( $args[0]['wp-head-callback'] && $args[0]['admin-head-callback'] ) {
             add_action( 'wp_head', $args[0]['wp-head-callback'] );
 
-        if ( is_admin() ) {
-            require_once( ABSPATH . 'wp-admin/custom-header.php' );
-            $custom_image_header = new Custom_Image_Header( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] );
+            if ( is_admin() ) {
+                require_once( ABSPATH . 'wp-admin/custom-header.php' );
+                $custom_image_header = new Custom_Image_Header( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] );
+            }
         }
     }
@@ -1557 +1558 @@
         $old_theme = wp_get_theme( $stylesheet );
 
+        
         if ( $old_theme->exists() )
             do_action( 'after_switch_theme', $old_theme->get('Name'), $old_theme );