Changeset 21054

Timestamp:

06/11/2012 09:25:05 PM (13 years ago)

Author:

nacin

Message:

Do not specify background-image: none when a user removes a custom background
on a theme that has a default background image.

The onus is on the theme to omit the default background-image from style.css,
to allow the user to remove the default background image. Or, the theme can
specify a background-image for the body selector, as long as they then zero
it out for body.custom-background, like so:

body {
	background-image: url( ... );
}
body.custom-background {
	background-image: none;
}

This allows the theme to be compatible with the custom background feature
but also gracefully degrade if the background feature is disabled.

This is the same behavior as 3.3; setting a default image has simply been
made more prominent in 3.4. Reverts [21013], also parts of [21001].
see #20448 for change and discussion history.

see #20132, which will now be marked as invalid.

Also, per previous changes in #20448, the custom-background class should not
be shown when only a default color is in use.

fixes #20448.

Location:

trunk/wp-includes

Files:

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

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

@@ -338 +338 @@
             '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 = '',
-                    hasDefault = api.settings.backgroundImageHasDefault;
+                var css = '';
 
                 // The body will support custom backgrounds if either
@@ -117 +116 @@
                 //
                 // See get_body_class() in /wp-includes/post-template.php
-                body.toggleClass( 'custom-background', !! ( color() || image() || hasDefault ) );
+                body.toggleClass( 'custom-background', !! ( color() || image() ) );
 
                 if ( color() )
@@ -127 +126 @@
                     css += 'background-repeat: ' + repeat() + ';';
                     css += 'background-position: top ' + attachment() + ';';
-                } else if ( hasDefault ) {
-                    css += 'background-image: none;';
                 }
 

trunk/wp-includes/post-template.php

@@ -502 +502 @@
         $classes[] = 'admin-bar';
 
-    if ( get_background_color() || get_theme_mod( 'background_image' ) || get_theme_support( 'custom-background', 'default-image' ) )
+    if ( get_theme_mod( 'background_color' ) || get_background_image() )
         $classes[] = 'custom-background';
 

trunk/wp-includes/theme.php

@@ -1110 +1110 @@
     $color = get_theme_mod( 'background_color' );
 
-    if ( ! $background && ! $color && ! get_theme_support( 'custom-background', 'default-image' ) )
+    if ( ! $background && ! $color )
         return;
 
@@ -1134 +1134 @@
 
         $style .= $image . $repeat . $position . $attachment;
-    } elseif ( get_theme_support( 'custom-background', 'default-image' ) ) {
-        // If there is not a $background, but there is a default, then the default was
-        // removed and an empty value was saved. Remove it:
-        $style .= " background-image: none;";
     }
 ?>