Changeset 13189

Timestamp:

02/18/2010 03:12:05 AM (15 years ago)

Author:

ryan

Message:

Add defaults for background option radios. see #12186

Location:

trunk

Files:

• wp-admin/custom-background.php (modified) (3 diffs)
• wp-includes/theme.php (modified) (3 diffs)

trunk/wp-admin/custom-background.php

@@ -173 +173 @@
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Position' ); ?></span></legend>
 <label>
-<input name="background-position" type="radio" value="left" <?php checked('left', get_theme_mod('background_position')); ?> />
+<input name="background-position" type="radio" value="left" <?php checked('left', get_theme_mod('background_position', 'left')); ?> />
 <?php _e('Left') ?>
 </label>
 <label>
-<input name="background-position" type="radio" value="center" <?php checked('center', get_theme_mod('background_position')); ?> />
+<input name="background-position" type="radio" value="center" <?php checked('center', get_theme_mod('background_position', 'left')); ?> />
 <?php _e('Center') ?>
 </label>
 <label>
-<input name="background-position" type="radio" value="right" <?php checked('right', get_theme_mod('background_position')); ?> />
+<input name="background-position" type="radio" value="right" <?php checked('right', get_theme_mod('background_position', 'left')); ?> />
 <?php _e('Right') ?>
 </label>
@@ -188 +188 @@
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Repeat' ); ?></span></legend>
 <label>
-<input name="background-repeat" type="radio" value="no-repeat" <?php checked('no-repeat', get_theme_mod('background_repeat')); ?> />
+<input name="background-repeat" type="radio" value="no-repeat" <?php checked('no-repeat', get_theme_mod('background_repeat', 'repeat')); ?> />
 <?php _e('No repeat') ?>
 </label>
 <label>
-<input name="background-repeat" type="radio" value="repeat" <?php checked('repeat', get_theme_mod('background_repeat')); ?> />
+<input name="background-repeat" type="radio" value="repeat" <?php checked('repeat', get_theme_mod('background_repeat', 'repeat')); ?> />
 <?php _e('Tile') ?>
 </label>
@@ -199 +199 @@
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Attachment' ); ?></span></legend>
 <label>
-<input name="background-attachment" type="radio" value="scroll" <?php checked('scroll', get_theme_mod('background_attachment')); ?> />
+<input name="background-attachment" type="radio" value="scroll" <?php checked('scroll', get_theme_mod('background_attachment', 'fixed')); ?> />
 <?php _e('Scroll') ?>
 </label>
 <label>
-<input name="background-attachment" type="radio" value="fixed" <?php checked('fixed', get_theme_mod('background_attachment')); ?> />
+<input name="background-attachment" type="radio" value="fixed" <?php checked('fixed', get_theme_mod('background_attachment', 'fixed')); ?> />
 <?php _e('Fixed') ?>
 </label>

trunk/wp-includes/theme.php

@@ -1373 +1373 @@
  */
 function add_custom_background($header_callback = '', $admin_header_callback = '', $admin_image_div_callback = '') {
+    if ( isset($GLOBALS['custom_background']) )
+        return;
+
     if ( empty($header_callback) )
         $header_callback = '_custom_background_cb';
@@ -1398 +1401 @@
         return;
 
-    $repeat = get_theme_mod('background_repeat');
+    $repeat = get_theme_mod('background_repeat', 'repeat');
     if ( 'no-repeat' == $repeat )
         $repeat = 'background-repeat: no-repeat;';
     else
         $repeat = 'background-repeat: repeat;';
-    $position = get_theme_mod('background_position');
+    $position = get_theme_mod('background_position', 'left');
     if  ( 'center' == $position )
         $position = 'background-position-x: center;';
@@ -1410 +1413 @@
     else
         $position = 'background-position-x: left;';
-    $attachment = get_theme_mod('background_attachment');
+    $attachment = get_theme_mod('background_attachment', 'fixed');
     if ( 'scroll' == $attachment )
         $attachment = 'background-attachment: scroll;';