Changeset 20973

Timestamp:

06/01/12 20:31:50 (5 years ago)

Author:

ryan

Message:

Custom background fixes:

• Specify default background colors for the bundled themes.
• Change the default custom background callback to only operate on saved values, rather than default values.
• Prevent an unsaved default value from overriding a manually modified style.css file.

Props nacin, kobenland
fixes #20448

Location:

trunk

Files:

• wp-content/themes/twentyeleven/functions.php (modified) (1 diff)
• wp-content/themes/twentyten/functions.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (1 diff)
• wp-includes/theme.php (modified) (1 diff)

trunk/wp-content/themes/twentyeleven/functions.php

@@ -98 +98 @@
     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

trunk/wp-content/themes/twentyten/functions.php

@@ -95 +95 @@
 
     // 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.

trunk/wp-includes/post-template.php

@@ -502 +502 @@
         $classes[] = 'admin-bar';
 
-    if ( get_background_image() || get_background_color() )
+    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' ) ) ) )
         $classes[] = 'custom-background';
 

trunk/wp-includes/theme.php

@@ -1103 +1103 @@
  */
 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;