Changeset 3589

Timestamp:

12/27/2010 06:01:55 PM (14 years ago)

Author:

djpaul

Message:

Ensure custom background colour overrides default background image if no custom background image is set. Fixes #2971

File:

• trunk/bp-themes/bp-default/functions.php (modified) (2 diffs)

trunk/bp-themes/bp-default/functions.php

@@ -60 +60 @@
 
     // This theme allows users to set a custom background
-    add_custom_background();
+    add_custom_background( 'bp_dtheme_custom_background_style' );
 
     // Changeable header section starts here
@@ -197 +197 @@
 endif;
 
+if ( !function_exists( 'bp_dtheme_custom_background_style' ) ) :
+/**
+ * The style for the custom background image or colour.
+ *
+ * Referenced via add_custom_background() in bp_dtheme_setup().
+ *
+ * @see _custom_background_cb()
+ * @since 1.3
+ */
+function bp_dtheme_custom_background_style() {
+    $background = get_background_image();
+    $color = get_background_color();
+    if ( ! $background && ! $color )
+        return;
+
+    $style = $color ? "background-color: #$color;" : '';
+
+    if ( $style && !$background ) {
+        $style .= ' background-image: none;';
+
+    } elseif ( $background ) {
+        $image = " background-image: url('$background');";
+
+        $repeat = get_theme_mod( 'background_repeat', 'repeat' );
+        if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) )
+            $repeat = 'repeat';
+        $repeat = " background-repeat: $repeat;";
+
+        $position = get_theme_mod( 'background_position_x', 'left' );
+        if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) )
+            $position = 'left';
+        $position = " background-position: top $position;";
+
+        $attachment = get_theme_mod( 'background_attachment', 'scroll' );
+        if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) )
+            $attachment = 'scroll';
+        $attachment = " background-attachment: $attachment;";
+
+        $style .= $image . $repeat . $position . $attachment;
+    }
+?>
+    <style type="text/css">
+        body { <?php echo trim( $style ); ?> }
+    </style>
+<?php
+}
+endif;
+
 if ( !function_exists( 'bp_dtheme_header_style' ) ) :
 /**