Changeset 17770

Timestamp:

04/29/2011 07:45:30 PM (14 years ago)

Author:

ryan

Message:

Fix hiding of header image. Fix radio selection when falling back to randomized default headers. Props lancewillett, kawauso. see #17240

Location:

trunk

Files:

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

trunk/wp-admin/custom-header.php

@@ -194 +194 @@
         if ( isset( $_POST['removeheader'] ) ) {
             check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-            set_theme_mod( 'header_image', '' );
+            set_theme_mod( 'header_image', 'remove-header' );
             return;
         }
@@ -547 +547 @@
 </tr>
     <?php endif;
-    if ( get_header_image() && !is_random_header_image() ) : ?>
+    if ( get_header_image() ) : ?>
 <tr valign="top">
 <th scope="row"><?php _e( 'Remove Image' ); ?></th>
@@ -557 +557 @@
     <?php endif;
 
-    if ( defined( 'HEADER_IMAGE' ) && !is_random_header_image() ) : ?>
+    if ( defined( 'HEADER_IMAGE' ) && '' != HEADER_IMAGE ) : ?>
 <tr valign="top">
 <th scope="row"><?php _e( 'Reset Image' ); ?></th>

trunk/wp-includes/theme.php

@@ -1430 +1430 @@
     $url = get_theme_mod( 'header_image', $default );
 
+    if ( 'remove-header' == $url )
+        return false;
+
     if ( is_random_header_image() )
         $url = get_random_header_image();
@@ -1489 +1492 @@
     } else {
         if ( "random-$type-image" == $header_image_mod )
+            return true;
+        elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image()  )
             return true;
     }