Changeset 21001

Timestamp:

06/05/2012 06:35:31 PM (12 years ago)

Author:

ryan

Message:

Fix removing the default background image for themes that hard-code the default in css. Honor the default background image for themes that do not provide a fallback in css.

• <style> will appear if there is a default image registered. This is the same as 3.3.
• If only a default color is registered, it still assumes it is in the stylesheet, and no <style> will appear. This is a change from 3.3.
• <style> will continue to appear as before if there is a custom background color or image. This is the same as 3.3.
• This then allows for a default background image with background-image: none, overriding style.css. This is new.

Props nacin
see #20448

Location:

trunk/wp-includes

Files:

• post-template.php (modified) (1 diff)
• theme.php (modified) (2 diffs)

trunk/wp-includes/post-template.php

@@ -502 +502 @@
         $classes[] = 'admin-bar';
 
-    if ( get_theme_mod( 'background_image' ) || get_theme_mod( 'background_color' ) ||
-        ( '_custom_background_cb' != get_theme_support( 'custom-background', 'wp-head-callback' )
-            && ( get_theme_support( 'custom-background', 'default-image' ) ||
-                get_theme_support( 'custom-background', 'default-color' ) ) ) )
+    if ( get_background_color() || get_theme_mod( 'background_image' ) || get_theme_support( 'custom-background', 'default-image' ) )
         $classes[] = 'custom-background';
 

trunk/wp-includes/theme.php

@@ -1103 +1103 @@
  */
 function _custom_background_cb() {
-    $background = get_theme_mod( 'background_image' );
+    $background = get_background_image();
     $color = get_theme_mod( 'background_color' );
 
-    if ( ! $background && ! $color )
+    if ( ! $background && ! $color && ! get_theme_support( 'custom-background', 'default-image' ) )
         return;
 
@@ -1130 +1130 @@
 
         $style .= $image . $repeat . $position . $attachment;
+    } elseif ( get_theme_support( 'custom-background', 'default-image' ) ) {
+        $style .= " background-image: none;";
     }
 ?>