Ticket #31742: 31742.2.diff

wp-includes/js/customize-views.js

@@ -105 +105 @@
                 },
 
                 initialize: function() {
-                        var properties = [
-                                this.model.get('header').url,
-                                this.model.get('choice')
-                        ];
-
                         this.listenTo(this.model, 'change:selected', this.toggleSelected);
 
-                        if (_.contains(properties, api.get().header_image)) {
+                        if ( this.isCurrentHeader() ) {
                                 api.HeaderTool.currentHeader.set(this.extendedModel());
                         }
                 },
 
+                isCurrentHeader: function() {
+                        var currentHeaderId = api.get().header_image_data.attachment_id;
+                        if ( currentHeaderId && this.model.get( 'header' ).attachment_id === currentHeaderId ) {
+                                return true;
+                        }
+                        if ( ! currentHeaderId && _.contains( [ this.model.get( 'choice' ), this.model.get( 'header' ).url ], api.get().header_image ) ) {
+                                return true;
+                        }
+                        return false;
+                },
+
                 render: function() {
                         this.$el.html(this.template(this.extendedModel()));