Ticket #26386: 26386.3.diff

wp-admin/custom-background.php

@@ -207 +207 @@
                         set_theme_mod('background_position_x', $position);
                 }
 
+                if ( isset($_POST['background-size']) ) {
+                        check_admin_referer('custom-background');
+                        if ( in_array($_POST['background-size'], array('auto', 'cover', 'contain')) )
+                                $size = $_POST['background-size'];
+                        else
+                                $size = 'auto';
+                        set_theme_mod('background_size', $size);
+                }
+
                 if ( isset($_POST['background-attachment']) ) {
                         check_admin_referer('custom-background');
                         if ( in_array($_POST['background-attachment'], array('fixed', 'scroll')) )
@@ -265 +274 @@
                         // Background-image URL must be single quote, see below.
                         $background_styles .= ' background-image: url(\'' . $background_image_thumb . '\');'
                                 . ' background-repeat: ' . get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) . ';'
-                                . ' background-position: top ' . get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
+                                . ' background-position: top ' . get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) ) . ';'
+                                . ' background-size: ' . get_theme_mod('background_size', get_theme_support('custom-background', 'default-size')) ;
                 }
         ?>
         <div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // must be double quote, see above ?>
@@ -361 +371 @@
 </tr>
 
 <tr>
+<th scope="row"><?php _e( 'Size' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Size' ); ?></span></legend>
+<label><input type="radio" name="background-size" value="auto"<?php checked( 'auto', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?> /> <?php _e('Auto'); ?></label>
+        <label><input type="radio" name="background-size" value="cover"<?php checked( 'cover', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?> /> <?php _e('Cover'); ?></label>
+        <label><input type="radio" name="background-size" value="contain"<?php checked( 'contain', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?> /> <?php _e('Contain'); ?></label>
+</fieldset></td>
+</tr>
+
+<tr>
 <th scope="row"><?php _ex( 'Attachment', 'Background Attachment' ); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Attachment' ); ?></span></legend>
 <label>

wp-includes/class-wp-customize-manager.php

@@ -1101 +1101 @@
                         ),
                 ) );
 
+                $this->add_setting( 'background_size', array(
+                        'default'        => get_theme_support( 'custom-background', 'default-size' ),
+                        'theme_supports' => 'custom-background',
+                ) );
+
+                $this->add_control( 'background_size', array(
+                        'label'      => __( 'Background Size' ),
+                        'section'    => 'background_image',
+                        'type'       => 'radio',
+                        'choices'    => array(
+                                'auto'       => __('Auto'),
+                                'cover'      => __('Cover'),
+                                'contain'    => __('Contain'),
+                        ),
+                ) );
+
                 $this->add_setting( 'background_position_x', array(
                         'default'        => get_theme_support( 'custom-background', 'default-position-x' ),
                         'theme_supports' => 'custom-background',

wp-includes/theme.php

@@ -1333 +1333 @@
                         $position = 'left';
                 $position = " background-position: top $position;";
 
+                $size = get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size'));
+                if ( ! in_array( $size, array('auto', 'cover', 'contain')))
+                        $size = 'auto';
+                $size = " background-size: $size;";
+
                 $attachment = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
                 if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) )
                         $attachment = 'scroll';
                 $attachment = " background-attachment: $attachment;";
 
-                $style .= $image . $repeat . $position . $attachment;
+                $style .= $image . $repeat . $position . $size . $attachment;
         }
 ?>
 <style type="text/css" id="custom-background-css">
@@ -1582 +1587 @@
                                 'default-image'          => '',
                                 'default-repeat'         => 'repeat',
                                 'default-position-x'     => 'left',
+                                'default-size'           => 'auto',
                                 'default-attachment'     => 'scroll',
                                 'default-color'          => '',
                                 'wp-head-callback'       => '_custom_background_cb',