Ticket #20448: 20448.12.diff

wp-includes/class-wp-customize-manager.php

@@ -312 +312 @@
                 $settings = array(
                         'values'  => array(),
                         'channel' => esc_js( $_POST['customize_messenger_channel'] ),
+                        'backgroundImageHasDefault' => current_theme_supports( 'custom-background', 'default-image' ),
                 );
 
                 foreach ( $this->settings as $id => $setting ) {

wp-includes/js/customize-preview.dev.js

@@ -109 +109 @@
                                 return;
 
                         update = function() {
-                                var css = '';
+                                var css = '',
+                                        hasDefault = api.settings.backgroundImageHasDefault;
 
                                 // The body will support custom backgrounds if either
                                 // the color or image are set.
                                 //
                                 // See get_body_class() in /wp-includes/post-template.php
-                                body.toggleClass( 'custom-background', !! ( color() || image() ) );
+                                body.toggleClass( 'custom-background', !! ( color() || image() || hasDefault ) );
 
                                 if ( color() )
                                         css += 'background-color: ' + color() + ';';
@@ -125 +126 @@
                                         css += 'background-position: top ' + position_x() + ';';
                                         css += 'background-repeat: ' + repeat() + ';';
                                         css += 'background-position: top ' + attachment() + ';';
+                                } else if ( hasDefault ) {
+                                        css += 'background-image: none;';
                                 }
 
                                 // Refresh the stylesheet by removing and recreating it.