Ticket #38558: 38558.1.diff
File 38558.1.diff, 2.1 KB (added by , 8 years ago) |
---|
-
src/wp-includes/js/customize-models.js
38 38 hide: function() { 39 39 this.set('choice', ''); 40 40 api('header_image').set('remove-header'); 41 api('header_image_data').set(' remove-header');41 api('header_image_data').set(''); 42 42 }, 43 43 44 44 destroy: function() { … … 64 64 save: function() { 65 65 if (this.get('random')) { 66 66 api('header_image').set(this.get('header').random); 67 api('header_image_data').set( this.get('header').random);67 api('header_image_data').set(''); 68 68 } else { 69 if (this.get('header').defaultName) { 70 api('header_image').set(this.get('header').url); 71 api('header_image_data').set(this.get('header').defaultName); 72 } else { 73 api('header_image').set(this.get('header').url); 74 api('header_image_data').set(this.get('header')); 75 } 69 api('header_image').set(this.get('header').url); 70 api('header_image_data').set(this.get('header')); 76 71 } 77 72 78 73 api.HeaderTool.combinedList.trigger('control:setImage', this); -
src/wp-includes/customize/class-wp-customize-header-image-setting.php
31 31 32 32 // If the value doesn't exist (removed or random), 33 33 // use the header_image value. 34 if ( ! $value ) 34 if ( ! $value ) { 35 35 $value = $this->manager->get_setting('header_image')->post_value(); 36 } 36 37 37 if ( is_array( $value ) && isset( $value['choice'] ) ) 38 if ( is_array( $value ) && isset( $value['choice'] ) ) { 38 39 $custom_image_header->set_header_image( $value['choice'] ); 39 else 40 } elseif ( is_array( $value ) && isset( $value['defaultName'] ) ) { 41 $custom_image_header->set_header_image( $value['defaultName'] ); 42 } else { 40 43 $custom_image_header->set_header_image( $value ); 44 } 41 45 } 42 46 }