Ticket #38558: 38558.1.diff

src/wp-includes/js/customize-models.js

@@ -38 +38 @@
                 hide: function() {
                         this.set('choice', '');
                         api('header_image').set('remove-header');
-                        api('header_image_data').set('remove-header');
+                        api('header_image_data').set('');
                 },
 
                 destroy: function() {
@@ -64 +64 @@
                 save: function() {
                         if (this.get('random')) {
                                 api('header_image').set(this.get('header').random);
-                                api('header_image_data').set(this.get('header').random);
+                                api('header_image_data').set('');
                         } else {
-                                if (this.get('header').defaultName) {
-                                        api('header_image').set(this.get('header').url);
-                                        api('header_image_data').set(this.get('header').defaultName);
-                                } else {
-                                        api('header_image').set(this.get('header').url);
-                                        api('header_image_data').set(this.get('header'));
-                                }
+                                api('header_image').set(this.get('header').url);
+                                api('header_image_data').set(this.get('header'));
                         }
 
                         api.HeaderTool.combinedList.trigger('control:setImage', this);

src/wp-includes/customize/class-wp-customize-header-image-setting.php

@@ -31 +31 @@
 
                 // If the value doesn't exist (removed or random),
                 // use the header_image value.
-                if ( ! $value )
+                if ( ! $value ) {
                         $value = $this->manager->get_setting('header_image')->post_value();
+                }
 
-                if ( is_array( $value ) && isset( $value['choice'] ) )
+                if ( is_array( $value ) && isset( $value['choice'] ) ) {
                         $custom_image_header->set_header_image( $value['choice'] );
-                else
+                } elseif ( is_array( $value ) && isset( $value['defaultName'] ) ) {
+                        $custom_image_header->set_header_image( $value['defaultName'] );
+                } else {
                         $custom_image_header->set_header_image( $value );
+                }
         }
 }