WordPress.org
Get WordPress

Make WordPress Core

Changeset 26352


Ignore:
Timestamp:
11/24/2013 02:04:50 PM (11 years ago)
Author:
duck_
Message:

Allow customisation of theme mod defaults via custom-background theme support.

Give the power to theme authors to select defaults when registering
custom-background support.

Props obenland. Fixes #20816.

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-admin/custom-background.php

    r25868 r26352  
    207207    // background-image URL must be single quote, see below
    208208    $background_styles .= ' background-image: url(\'' . $background_image_thumb . '\');'
    209         . ' background-repeat: ' . get_theme_mod('background_repeat', 'repeat') . ';'
    210         . ' background-position: top ' . get_theme_mod('background_position_x', 'left');
     209        . ' background-repeat: ' . get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'background-repeat' ) ) . ';'
     210        . ' background-position: top ' . get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'background-position' ) );
    211211}
    212212?>
    … …  
    278278<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Position' ); ?></span></legend>
    279279<label>
    280 <input name="background-position-x" type="radio" value="left"<?php checked('left', get_theme_mod('background_position_x', 'left')); ?> />
     280<input name="background-position-x" type="radio" value="left"<?php checked( 'left', get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'background-position' ) ) ); ?> />
    281281<?php _e('Left') ?>
    282282</label>
    283283<label>
    284 <input name="background-position-x" type="radio" value="center"<?php checked('center', get_theme_mod('background_position_x', 'left')); ?> />
     284<input name="background-position-x" type="radio" value="center"<?php checked( 'center', get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'background-position' ) ) ); ?> />
    285285<?php _e('Center') ?>
    286286</label>
    287287<label>
    288 <input name="background-position-x" type="radio" value="right"<?php checked('right', get_theme_mod('background_position_x', 'left')); ?> />
     288<input name="background-position-x" type="radio" value="right"<?php checked( 'right', get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'background-position' ) ) ); ?> />
    289289<?php _e('Right') ?>
    290290</label>
    … …  
    295295<th scope="row"><?php _e( 'Repeat' ); ?></th>
    296296<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Repeat' ); ?></span></legend>
    297 <label><input type="radio" name="background-repeat" value="no-repeat"<?php checked('no-repeat', get_theme_mod('background_repeat', 'repeat')); ?> /> <?php _e('No Repeat'); ?></label>
    298     <label><input type="radio" name="background-repeat" value="repeat"<?php checked('repeat', get_theme_mod('background_repeat', 'repeat')); ?> /> <?php _e('Tile'); ?></label>
    299     <label><input type="radio" name="background-repeat" value="repeat-x"<?php checked('repeat-x', get_theme_mod('background_repeat', 'repeat')); ?> /> <?php _e('Tile Horizontally'); ?></label>
    300     <label><input type="radio" name="background-repeat" value="repeat-y"<?php checked('repeat-y', get_theme_mod('background_repeat', 'repeat')); ?> /> <?php _e('Tile Vertically'); ?></label>
     297<label><input type="radio" name="background-repeat" value="no-repeat"<?php checked( 'no-repeat', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'background-repeat' ) ) ); ?> /> <?php _e('No Repeat'); ?></label>
     298    <label><input type="radio" name="background-repeat" value="repeat"<?php checked( 'repeat', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'background-repeat' ) ) ); ?> /> <?php _e('Tile'); ?></label>
     299    <label><input type="radio" name="background-repeat" value="repeat-x"<?php checked( 'repeat-x', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'background-repeat' ) ) ); ?> /> <?php _e('Tile Horizontally'); ?></label>
     300    <label><input type="radio" name="background-repeat" value="repeat-y"<?php checked( 'repeat-y', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'background-repeat' ) ) ); ?> /> <?php _e('Tile Vertically'); ?></label>
    301301</fieldset></td>
    302302</tr>
    … …  
    306306<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Attachment' ); ?></span></legend>
    307307<label>
    308 <input name="background-attachment" type="radio" value="scroll" <?php checked('scroll', get_theme_mod('background_attachment', 'scroll')); ?> />
    309 <?php _e('Scroll') ?>
     308<input name="background-attachment" type="radio" value="scroll" <?php checked( 'scroll', get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'background-attachment' ) ) ); ?> />
     309<?php _e( 'Scroll' ); ?>
    310310</label>
    311311<label>
    312 <input name="background-attachment" type="radio" value="fixed" <?php checked('fixed', get_theme_mod('background_attachment', 'scroll')); ?> />
    313 <?php _e('Fixed') ?>
     312<input name="background-attachment" type="radio" value="fixed" <?php checked( 'fixed', get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'background-attachment' ) ) ); ?> />
     313<?php _e( 'Fixed' ); ?>
    314314</label>
    315315</fieldset></td>

  • trunk/src/wp-includes/theme.php

    r25272 r26352  
    11721172        $image = " background-image: url('$background');";
    11731173
    1174         $repeat = get_theme_mod( 'background_repeat', 'repeat' );
     1174        $repeat = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'background-repeat' ) );
    11751175        if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) )
    11761176            $repeat = 'repeat';
    11771177        $repeat = " background-repeat: $repeat;";
    11781178
    1179         $position = get_theme_mod( 'background_position_x', 'left' );
     1179        $position = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'background-position' ) );
    11801180        if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) )
    11811181            $position = 'left';
    11821182        $position = " background-position: top $position;";
    11831183
    1184         $attachment = get_theme_mod( 'background_attachment', 'scroll' );
     1184        $attachment = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'background-attachment' ) );
    11851185        if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) )
    11861186            $attachment = 'scroll';
    … …  
    13741374
    13751375            $defaults = array(
    1376                 'default-image' => '',
    1377                 'default-color' => '',
    1378                 'wp-head-callback' => '_custom_background_cb',
    1379                 'admin-head-callback' => '',
     1376                'default-image'          => '',
     1377                'background-repeat'      => 'repeat',
     1378                'background-position'    => 'left',
     1379                'background-attachment'  => 'scroll',
     1380                'default-color'          => '',
     1381                'wp-head-callback'       => '_custom_background_cb',
     1382                'admin-head-callback'    => '',
    13801383                'admin-preview-callback' => '',
    13811384            );
Note: See TracChangeset for help on using the changeset viewer.