Changeset 20712

Timestamp:

05/03/2012 01:30:55 PM (13 years ago)

Author:

nacin

Message:

Make admin-head-callback optional for custom headers. Reverts part of [20684]. fixes #20603.

Location:

trunk

Files:

• wp-admin/custom-header.php (modified) (1 diff)
• wp-includes/theme.php (modified) (2 diffs)

trunk/wp-admin/custom-header.php

@@ -92 +92 @@
         add_action("admin_head-$page", array(&$this, 'take_action'), 50);
         add_action("admin_head-$page", array(&$this, 'js'), 50);
-        add_action("admin_head-$page", $this->admin_header_callback, 51);
+        if ( $this->admin_header_callback )
+            add_action("admin_head-$page", $this->admin_header_callback, 51);
 
         add_filter( 'attachment_fields_to_edit', array( $this, 'attachment_fields_to_edit' ), 10, 2 );

trunk/wp-includes/theme.php

@@ -1348 +1348 @@
 
         $args = get_theme_support( 'custom-header' );
-        if ( $args[0]['wp-head-callback'] && $args[0]['admin-head-callback'] ) {
+        if ( $args[0]['wp-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'] );
         }
     }
@@ -1558 +1557 @@
         $old_theme = wp_get_theme( $stylesheet );
 
-        
         if ( $old_theme->exists() )
             do_action( 'after_switch_theme', $old_theme->get('Name'), $old_theme );