Changeset 20684 for trunk/wp-includes/theme.php

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.

File:

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

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 );