Ticket #20763: 20763.2.diff

wp-admin/custom-background.php

@@ -234 +234 @@
 </tr>
 <?php endif; ?>
 
-<?php if ( get_theme_support( 'custom-background', 'default-image' ) ) : ?>
+<?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?> 
+<?php if ( $default_image && get_background_image() != $default_image ) : ?>
 <tr valign="top">
 <th scope="row"><?php _e('Restore Original Image'); ?></th>
 <td>

wp-admin/custom-header.php

@@ -637 +637 @@
 </tr>
         <?php endif;
 
-        if ( current_theme_supports( 'custom-header', 'default-image' ) ) : ?>
+        $default_image = get_theme_support( 'custom-header', 'default-image' );
+        if ( $default_image && get_header_image() != $default_image ) : ?>
 <tr valign="top">
 <th scope="row"><?php _e( 'Reset Image' ); ?></th>
 <td>