Changeset 13668

Timestamp:

03/11/2010 08:21:58 PM (15 years ago)

Author:

ryan

Message:

Custom background color fixes. see #12186

Location:

trunk

Files:

• wp-admin/css/wp-admin.dev.css (modified) (1 diff)
• wp-admin/custom-background.php (modified) (1 diff)
• wp-includes/theme.php (modified) (2 diffs)

trunk/wp-admin/css/wp-admin.dev.css

@@ -3660 +3660 @@
 }
 
+#custom-background-image {
+    max-width: 400px;
+    max-height: 200px;
+}
+
 div#custom-background-image img {
     max-width: 400px;

trunk/wp-admin/custom-background.php

@@ -228 +228 @@
 <?php screen_icon(); ?>
 <h2><?php _e('Custom Background'); ?></h2>
-<?php if ( get_background_image() ) { ?>
-<p><?php _e('This is your current background image.'); ?></p>
+<?php if ( get_background_image() || get_background_color() ) { ?>
+<p><?php _e('This is your current background.'); ?></p>
 <?php
     if ( $this->admin_image_div_callback ) {
         call_user_func($this->admin_image_div_callback);
     } else {
+        if ( $bgcolor = get_background_color() )
+            $bgcolor = ' style="background-color: #' . $bgcolor . ';"';
+        else
+            $bgcolor = '';
 ?>
-<div id="custom-background-image" style="background-color: #<?php background_color(); ?>;">
+<div id="custom-background-image"<?php echo $bgcolor; ?>>
+<?php if ( get_background_image() ) { ?>
 <img class="custom-background-image" src="<?php background_image(); ?>" />
+<?php } ?>
 </div>
 <?php }

trunk/wp-includes/theme.php

@@ -1437 +1437 @@
 function _custom_background_cb() {
     $background = get_background_image();
-
-    if ( !$background )
+    $color = get_background_color();
+    if ( !$background && !$color )
         return;
 
@@ -1458 +1458 @@
     else
         $attachment = 'background-attachment: fixed;';
+
+    if ( !empty($background ) )
+        $image = "background-image: url('$background');";
+    else
+        $image = '';
+
+    if ( !empty($background ) )
+        $image = "background-image: url('$background');";
+    else
+        $image = '';
+
+    if ( !empty($color) )
+        $color = "background-color: #$color;";
+    else
+        $color = '';
 ?>
 <style type="text/css">
 body {
-    background-color: #<?php background_color(); ?>;
-    background-image: url('<?php background_image(); ?>');
+    <?php echo $image; ?>
+    <?php echo $color; ?>
     <?php echo $repeat; ?>
     <?php echo $position; ?>