Changeset 21013

Timestamp:

06/06/2012 09:24:22 PM (14 years ago)

Author:

ryan

Message:

Don't resurrect a removed default image when changing colors in the Customizer. Props koopersmith, nacin. fixes #20448

Location:

trunk/wp-includes

Files:

• class-wp-customize-manager.php (modified) (1 diff)
• js/customize-preview.dev.js (modified) (3 diffs)

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

@@ -313 +313 @@
                         'values'  => array(),
                         'channel' => esc_js( $_POST['customize_messenger_channel'] ),
+                        'backgroundImageHasDefault' => current_theme_supports( 'custom-background', 'default-image' ),
                 );
 

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

@@ -110 +110 @@
 
                         update = function() {
-                                var css = '';
+                                var css = '',
+                                        hasDefault = api.settings.backgroundImageHasDefault;
 
                                 // The body will support custom backgrounds if either
@@ -116 +117 @@
                                 //
                                 // 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() )
@@ -126 +127 @@
                                         css += 'background-repeat: ' + repeat() + ';';
                                         css += 'background-position: top ' + attachment() + ';';
+                                } else if ( hasDefault ) {
+                                        css += 'background-image: none;';
                                 }