Ticket #20448: 20448.7.diff

wp-includes/post-template.php

@@ -501 +501 @@
         if ( is_admin_bar_showing() )
                 $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_image() || get_background_color() )
                 $classes[] = 'custom-background';
 
         $page = $wp_query->get( 'page' );

wp-includes/theme.php

@@ -1063 +1063 @@
  * @return string
  */
 function get_background_image() {
-        return get_theme_mod('background_image', get_theme_support( 'custom-background', 'default-image' ) );
+        $bg = get_theme_mod('background_image', false );
+        if ( false !== $bg )
+                return $bg;
+
+        return sprintf( get_theme_support( 'custom-background', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() ) ;
 }
 
 /**
@@ -1102 +1106 @@
  * @access protected
  */
 function _custom_background_cb() {
-        $background = get_theme_mod( 'background_image' );
-        $color = get_theme_mod( 'background_color' );
+        $background = get_background_image();
+        $color = get_background_color();
 
         if ( ! $background && ! $color )
                 return;
@@ -1129 +1133 @@
                 $attachment = " background-attachment: $attachment;";
 
                 $style .= $image . $repeat . $position . $attachment;
+        } else if ( '' === $background && get_theme_support( 'custom-background', 'default-image' ) ) {
+                $image = " background-image: none;";
+                $style .= $image;
         }
 ?>
 <style type="text/css" id="custom-background-css">