From 2dbb51b71f3ecc1caf8db13142aa40665454f2f9 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Tue, 5 Jun 2012 18:35:31 +0000
Subject: [PATCH] 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


git-svn-id: https://develop.svn.wordpress.org/trunk@21001 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/post-template.php | 5 +----
 wp-includes/theme.php         | 6 ++++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index e242c22119..e42ac46a7a 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -501,10 +501,7 @@ function get_body_class( $class = '' ) {
 	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_color() || get_theme_mod( 'background_image' ) || get_theme_support( 'custom-background', 'default-image' ) )
 		$classes[] = 'custom-background';
 
 	$page = $wp_query->get( 'page' );
diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index f0c932dc99..409982c0e9 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -1102,10 +1102,10 @@ function background_color() {
  * @access protected
  */
 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;
 
 	$style = $color ? "background-color: #$color;" : '';
@@ -1129,6 +1129,8 @@ function _custom_background_cb() {
 		$attachment = " background-attachment: $attachment;";
 
 		$style .= $image . $repeat . $position . $attachment;
+	} elseif ( get_theme_support( 'custom-background', 'default-image' ) ) {
+		$style .= " background-image: none;";
 	}
 ?>
 <style type="text/css" id="custom-background-css">