Ticket #20448: 20448.5.diff

wp-includes/post-template.php

@@ -501 +501 @@
         if ( is_admin_bar_showing() )
                 $classes[] = 'admin-bar';
 
-        if ( get_background_image() || get_background_color() )
+        if ( get_theme_mod( 'background_image' ) || get_theme_mod( 'background_color' ) )
                 $classes[] = 'custom-background';
 
         $page = $wp_query->get( 'page' );

wp-includes/theme.php

@@ -1102 +1102 @@
  * @access protected
  */
 function _custom_background_cb() {
-        $background = get_background_image();
-        $color = get_background_color();
+        $background = get_theme_mod( 'background_image' );
+        $color = get_theme_mod( 'background_color' );
+
         if ( ! $background && ! $color )
                 return;
 

wp-content/themes/twentyten/functions.php

@@ -94 +94 @@
         ) );
 
         // This theme allows users to set a custom background.
-        add_theme_support( 'custom-background' );
+        add_theme_support( 'custom-background', array(
+                // Let WordPress know what our default background color is.
+                'default-color' => 'f1f1f1',
+        );
 
         // The custom header business starts here.
 

wp-content/themes/twentyeleven/functions.php

@@ -97 +97 @@
         // Add support for a variety of post formats
         add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) );
 
+        $theme_options = twentyeleven_get_theme_options();
+        if ( 'dark' == $theme_options['color_scheme'] )
+                $default_background_color = '1d1d1d';
+        else
+                $default_background_color = 'f1f1f1';
+
         // Add support for custom backgrounds.
-        add_theme_support( 'custom-background' );
+        add_theme_support( 'custom-background', array(
+                // Let WordPress know what our default background color is.
+                // This is dependent on our current color scheme.
+                'default-color' => $default_background_color,
+        ) );
 
         // This theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images
         add_theme_support( 'post-thumbnails' );