<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[45662] trunk/src: Coding Standards: Move wp-admin/custom-background.php to wp-admin/includes/class-custom-background.php</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/45662">45662</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/45662","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-07-19 04:01:41 +0000 (Fri, 19 Jul 2019)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Move wp-admin/custom-background.php to wp-admin/includes/class-custom-background.php

This renames the file containing the Custom_Background class to conform to the coding standards.

This commit also includes:

- A new custom-background.php that includes the new file, for anyone that may've been including the file directly.
- Replaces a reference to the old filename with the new filename.

See <a href="https://core.trac.wordpress.org/ticket/47632">#47632</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincustombackgroundphp">trunk/src/wp-admin/custom-background.php</a></li>
<li><a href="#trunksrcwpadminincludesclasscustombackgroundphp">trunk/src/wp-admin/includes/class-custom-background.php</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincustombackgroundphp">trunk/src/wp-admin/custom-background.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincustombackgroundphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-admin/custom-background.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/custom-background.php  2019-07-19 03:49:26 UTC (rev 45661)
+++ trunk/src/wp-admin/custom-background.php    2019-07-19 04:01:41 UTC (rev 45662)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,606 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * The custom background script.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/**
- * The custom background class.
- *
- * @since 3.0.0
- */
-class Custom_Background {
-
-       /**
-        * Callback for administration header.
-        *
-        * @var callable
-        * @since 3.0.0
-        */
-       public $admin_header_callback;
-
-       /**
-        * Callback for header div.
-        *
-        * @var callable
-        * @since 3.0.0
-        */
-       public $admin_image_div_callback;
-
-       /**
-        * Used to trigger a success message when settings updated and set to true.
-        *
-        * @since 3.0.0
-        * @var bool
-        */
-       private $updated;
-
-       /**
-        * Constructor - Register administration header callback.
-        *
-        * @since 3.0.0
-        * @param callable $admin_header_callback
-        * @param callable $admin_image_div_callback Optional custom image div output callback.
-        */
-       public function __construct( $admin_header_callback = '', $admin_image_div_callback = '' ) {
-               $this->admin_header_callback    = $admin_header_callback;
-               $this->admin_image_div_callback = $admin_image_div_callback;
-
-               add_action( 'admin_menu', array( $this, 'init' ) );
-
-               add_action( 'wp_ajax_custom-background-add', array( $this, 'ajax_background_add' ) );
-
-               // Unused since 3.5.0.
-               add_action( 'wp_ajax_set-background-image', array( $this, 'wp_set_background_image' ) );
-       }
-
-       /**
-        * Set up the hooks for the Custom Background admin page.
-        *
-        * @since 3.0.0
-        */
-       public function init() {
-               $page = add_theme_page( __( 'Background' ), __( 'Background' ), 'edit_theme_options', 'custom-background', array( $this, 'admin_page' ) );
-               if ( ! $page ) {
-                       return;
-               }
-
-               add_action( "load-$page", array( $this, 'admin_load' ) );
-               add_action( "load-$page", array( $this, 'take_action' ), 49 );
-               add_action( "load-$page", array( $this, 'handle_upload' ), 49 );
-
-               if ( $this->admin_header_callback ) {
-                       add_action( "admin_head-$page", $this->admin_header_callback, 51 );
-               }
-       }
-
-       /**
-        * Set up the enqueue for the CSS & JavaScript files.
-        *
-        * @since 3.0.0
-        */
-       public function admin_load() {
-               get_current_screen()->add_help_tab(
-                       array(
-                               'id'      => 'overview',
-                               'title'   => __( 'Overview' ),
-                               'content' =>
-                                       '<p>' . __( 'You can customize the look of your site without touching any of your theme&#8217;s code by using a custom background. Your background can be an image or a color.' ) . '</p>' .
-                                       '<p>' . __( 'To use a background image, simply upload it or choose an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '</p>' .
-                                       '<p>' . __( 'You can also choose a background color by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.' ) . '</p>' .
-                                       '<p>' . __( 'Don&#8217;t forget to click on the Save Changes button when you are finished.' ) . '</p>',
-                       )
-               );
-
-               get_current_screen()->set_help_sidebar(
-                       '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-                       '<p>' . __( '<a href="https://codex.wordpress.org/Appearance_Background_Screen">Documentation on Custom Background</a>' ) . '</p>' .
-                       '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
-               );
-
-               wp_enqueue_media();
-               wp_enqueue_script( 'custom-background' );
-               wp_enqueue_style( 'wp-color-picker' );
-       }
-
-       /**
-        * Execute custom background modification.
-        *
-        * @since 3.0.0
-        */
-       public function take_action() {
-               if ( empty( $_POST ) ) {
-                       return;
-               }
-
-               if ( isset( $_POST['reset-background'] ) ) {
-                       check_admin_referer( 'custom-background-reset', '_wpnonce-custom-background-reset' );
-                       remove_theme_mod( 'background_image' );
-                       remove_theme_mod( 'background_image_thumb' );
-                       $this->updated = true;
-                       return;
-               }
-
-               if ( isset( $_POST['remove-background'] ) ) {
-                       // @TODO: Uploaded files are not removed here.
-                       check_admin_referer( 'custom-background-remove', '_wpnonce-custom-background-remove' );
-                       set_theme_mod( 'background_image', '' );
-                       set_theme_mod( 'background_image_thumb', '' );
-                       $this->updated = true;
-                       wp_safe_redirect( $_POST['_wp_http_referer'] );
-                       return;
-               }
-
-               if ( isset( $_POST['background-preset'] ) ) {
-                       check_admin_referer( 'custom-background' );
-
-                       if ( in_array( $_POST['background-preset'], array( 'default', 'fill', 'fit', 'repeat', 'custom' ), true ) ) {
-                               $preset = $_POST['background-preset'];
-                       } else {
-                               $preset = 'default';
-                       }
-
-                       set_theme_mod( 'background_preset', $preset );
-               }
-
-               if ( isset( $_POST['background-position'] ) ) {
-                       check_admin_referer( 'custom-background' );
-
-                       $position = explode( ' ', $_POST['background-position'] );
-
-                       if ( in_array( $position[0], array( 'left', 'center', 'right' ), true ) ) {
-                               $position_x = $position[0];
-                       } else {
-                               $position_x = 'left';
-                       }
-
-                       if ( in_array( $position[1], array( 'top', 'center', 'bottom' ), true ) ) {
-                               $position_y = $position[1];
-                       } else {
-                               $position_y = 'top';
-                       }
-
-                       set_theme_mod( 'background_position_x', $position_x );
-                       set_theme_mod( 'background_position_y', $position_y );
-               }
-
-               if ( isset( $_POST['background-size'] ) ) {
-                       check_admin_referer( 'custom-background' );
-
-                       if ( in_array( $_POST['background-size'], array( 'auto', 'contain', 'cover' ), true ) ) {
-                               $size = $_POST['background-size'];
-                       } else {
-                               $size = 'auto';
-                       }
-
-                       set_theme_mod( 'background_size', $size );
-               }
-
-               if ( isset( $_POST['background-repeat'] ) ) {
-                       check_admin_referer( 'custom-background' );
-
-                       $repeat = $_POST['background-repeat'];
-
-                       if ( 'no-repeat' !== $repeat ) {
-                               $repeat = 'repeat';
-                       }
-
-                       set_theme_mod( 'background_repeat', $repeat );
-               }
-
-               if ( isset( $_POST['background-attachment'] ) ) {
-                       check_admin_referer( 'custom-background' );
-
-                       $attachment = $_POST['background-attachment'];
-
-                       if ( 'fixed' !== $attachment ) {
-                               $attachment = 'scroll';
-                       }
-
-                       set_theme_mod( 'background_attachment', $attachment );
-               }
-
-               if ( isset( $_POST['background-color'] ) ) {
-                       check_admin_referer( 'custom-background' );
-                       $color = preg_replace( '/[^0-9a-fA-F]/', '', $_POST['background-color'] );
-                       if ( strlen( $color ) == 6 || strlen( $color ) == 3 ) {
-                               set_theme_mod( 'background_color', $color );
-                       } else {
-                               set_theme_mod( 'background_color', '' );
-                       }
-               }
-
-               $this->updated = true;
-       }
-
-       /**
-        * Display the custom background page.
-        *
-        * @since 3.0.0
-        */
-       public function admin_page() {
-               ?>
-<div class="wrap" id="custom-background">
-<h1><?php _e( 'Custom Background' ); ?></h1>
-
-               <?php if ( current_user_can( 'customize' ) ) { ?>
-<div class="notice notice-info hide-if-no-customize">
-       <p>
-                       <?php
-                               printf(
-                                       __( 'You can now manage and live-preview Custom Backgrounds in the <a href="%1$s">Customizer</a>.' ),
-                                       admin_url( 'customize.php?autofocus[control]=background_image' )
-                               );
-                       ?>
-       </p>
-</div>
-               <?php } ?>
-
-               <?php if ( ! empty( $this->updated ) ) { ?>
-<div id="message" class="updated">
-<p><?php printf( __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
-</div>
-               <?php } ?>
-
-<h2><?php _e( 'Background Image' ); ?></h2>
-
-<table class="form-table" role="presentation">
-<tbody>
-<tr>
-<th scope="row"><?php _e( 'Preview' ); ?></th>
-<td>
-               <?php
-               if ( $this->admin_image_div_callback ) {
-                       call_user_func( $this->admin_image_div_callback );
-               } else {
-                       $background_styles = '';
-                       $bgcolor           = get_background_color();
-                       if ( $bgcolor ) {
-                               $background_styles .= 'background-color: #' . $bgcolor . ';';
-                       }
-
-                       $background_image_thumb = get_background_image();
-                       if ( $background_image_thumb ) {
-                               $background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', $background_image_thumb ) ) ) );
-                               $background_position_x  = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
-                               $background_position_y  = get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) );
-                               $background_size        = get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) );
-                               $background_repeat      = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) );
-                               $background_attachment  = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
-
-                               // Background-image URL must be single quote, see below.
-                               $background_styles .= " background-image: url('$background_image_thumb');"
-                               . " background-size: $background_size;"
-                               . " background-position: $background_position_x $background_position_y;"
-                               . " background-repeat: $background_repeat;"
-                               . " background-attachment: $background_attachment;";
-                       }
-                       ?>
-       <div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // must be double quote, see above ?>
-                       <?php if ( $background_image_thumb ) { ?>
-               <img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" /><br />
-               <img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" />
-               <?php } ?>
-       </div>
-       <?php } ?>
-</td>
-</tr>
-
-               <?php if ( get_background_image() ) : ?>
-<tr>
-<th scope="row"><?php _e( 'Remove Image' ); ?></th>
-<td>
-<form method="post">
-                       <?php wp_nonce_field( 'custom-background-remove', '_wpnonce-custom-background-remove' ); ?>
-                       <?php submit_button( __( 'Remove Background Image' ), '', 'remove-background', false ); ?><br/>
-                       <?php _e( 'This will remove the background image. You will not be able to restore any customizations.' ); ?>
-</form>
-</td>
-</tr>
-               <?php endif; ?>
-
-               <?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?>
-               <?php if ( $default_image && get_background_image() != $default_image ) : ?>
-<tr>
-<th scope="row"><?php _e( 'Restore Original Image' ); ?></th>
-<td>
-<form method="post">
-                       <?php wp_nonce_field( 'custom-background-reset', '_wpnonce-custom-background-reset' ); ?>
-                       <?php submit_button( __( 'Restore Original Image' ), '', 'reset-background', false ); ?><br/>
-                       <?php _e( 'This will restore the original background image. You will not be able to restore any customizations.' ); ?>
-</form>
-</td>
-</tr>
-               <?php endif; ?>
-
-               <?php if ( current_user_can( 'upload_files' ) ) : ?>
-<tr>
-<th scope="row"><?php _e( 'Select Image' ); ?></th>
-<td><form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post">
-       <p>
-               <label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
-               <input type="file" id="upload" name="import" />
-               <input type="hidden" name="action" value="save" />
-                       <?php wp_nonce_field( 'custom-background-upload', '_wpnonce-custom-background-upload' ); ?>
-                       <?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
-       </p>
-       <p>
-               <label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
-               <button id="choose-from-library-link" class="button"
-                       data-choose="<?php esc_attr_e( 'Choose a Background Image' ); ?>"
-                       data-update="<?php esc_attr_e( 'Set as background' ); ?>"><?php _e( 'Choose Image' ); ?></button>
-       </p>
-       </form>
-</td>
-</tr>
-               <?php endif; ?>
-</tbody>
-</table>
-
-<h2><?php _e( 'Display Options' ); ?></h2>
-<form method="post">
-<table class="form-table" role="presentation">
-<tbody>
-               <?php if ( get_background_image() ) : ?>
-<input name="background-preset" type="hidden" value="custom">
-
-                       <?php
-                       $background_position = sprintf(
-                               '%s %s',
-                               get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) ),
-                               get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) )
-                       );
-
-                       $background_position_options = array(
-                               array(
-                                       'left top'   => array(
-                                               'label' => __( 'Top Left' ),
-                                               'icon'  => 'dashicons dashicons-arrow-left-alt',
-                                       ),
-                                       'center top' => array(
-                                               'label' => __( 'Top' ),
-                                               'icon'  => 'dashicons dashicons-arrow-up-alt',
-                                       ),
-                                       'right top'  => array(
-                                               'label' => __( 'Top Right' ),
-                                               'icon'  => 'dashicons dashicons-arrow-right-alt',
-                                       ),
-                               ),
-                               array(
-                                       'left center'   => array(
-                                               'label' => __( 'Left' ),
-                                               'icon'  => 'dashicons dashicons-arrow-left-alt',
-                                       ),
-                                       'center center' => array(
-                                               'label' => __( 'Center' ),
-                                               'icon'  => 'background-position-center-icon',
-                                       ),
-                                       'right center'  => array(
-                                               'label' => __( 'Right' ),
-                                               'icon'  => 'dashicons dashicons-arrow-right-alt',
-                                       ),
-                               ),
-                               array(
-                                       'left bottom'   => array(
-                                               'label' => __( 'Bottom Left' ),
-                                               'icon'  => 'dashicons dashicons-arrow-left-alt',
-                                       ),
-                                       'center bottom' => array(
-                                               'label' => __( 'Bottom' ),
-                                               'icon'  => 'dashicons dashicons-arrow-down-alt',
-                                       ),
-                                       'right bottom'  => array(
-                                               'label' => __( 'Bottom Right' ),
-                                               'icon'  => 'dashicons dashicons-arrow-right-alt',
-                                       ),
-                               ),
-                       );
-                       ?>
-<tr>
-<th scope="row"><?php _e( 'Image Position' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Image Position' ); ?></span></legend>
-<div class="background-position-control">
-                       <?php foreach ( $background_position_options as $group ) : ?>
-       <div class="button-group">
-                               <?php foreach ( $group as $value => $input ) : ?>
-               <label>
-                       <input class="screen-reader-text" name="background-position" type="radio" value="<?php echo esc_attr( $value ); ?>"<?php checked( $value, $background_position ); ?>>
-                       <span class="button display-options position"><span class="<?php echo esc_attr( $input['icon'] ); ?>" aria-hidden="true"></span></span>
-                       <span class="screen-reader-text"><?php echo $input['label']; ?></span>
-               </label>
-       <?php endforeach; ?>
-       </div>
-<?php endforeach; ?>
-</div>
-</fieldset></td>
-</tr>
-
-<tr>
-<th scope="row"><label for="background-size"><?php _e( 'Image Size' ); ?></label></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Image Size' ); ?></span></legend>
-<select id="background-size" name="background-size">
-<option value="auto"<?php selected( 'auto', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?>><?php _ex( 'Original', 'Original Size' ); ?></option>
-<option value="contain"<?php selected( 'contain', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?>><?php _e( 'Fit to Screen' ); ?></option>
-<option value="cover"<?php selected( 'cover', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?>><?php _e( 'Fill Screen' ); ?></option>
-</select>
-</fieldset></td>
-</tr>
-
-<tr>
-<th scope="row"><?php _ex( 'Repeat', 'Background Repeat' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _ex( 'Repeat', 'Background Repeat' ); ?></span></legend>
-<input name="background-repeat" type="hidden" value="no-repeat">
-<label><input type="checkbox" name="background-repeat" value="repeat"<?php checked( 'repeat', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) ); ?>> <?php _e( 'Repeat Background Image' ); ?></label>
-</fieldset></td>
-</tr>
-
-<tr>
-<th scope="row"><?php _ex( 'Scroll', 'Background Scroll' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _ex( 'Scroll', 'Background Scroll' ); ?></span></legend>
-<input name="background-attachment" type="hidden" value="fixed">
-<label><input name="background-attachment" type="checkbox" value="scroll" <?php checked( 'scroll', get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) ) ); ?>> <?php _e( 'Scroll with Page' ); ?></label>
-</fieldset></td>
-</tr>
-<?php endif; // get_background_image() ?>
-<tr>
-<th scope="row"><?php _e( 'Background Color' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Color' ); ?></span></legend>
-               <?php
-               $default_color = '';
-               if ( current_theme_supports( 'custom-background', 'default-color' ) ) {
-                       $default_color = ' data-default-color="#' . esc_attr( get_theme_support( 'custom-background', 'default-color' ) ) . '"';
-               }
-               ?>
-<input type="text" name="background-color" id="background-color" value="#<?php echo esc_attr( get_background_color() ); ?>"<?php echo $default_color; ?>>
-</fieldset></td>
-</tr>
-</tbody>
-</table>
-
-               <?php wp_nonce_field( 'custom-background' ); ?>
-               <?php submit_button( null, 'primary', 'save-background-options' ); ?>
-</form>
-
-</div>
-               <?php
-       }
-
-       /**
-        * Handle an Image upload for the background image.
-        *
-        * @since 3.0.0
-        */
-       public function handle_upload() {
-               if ( empty( $_FILES ) ) {
-                       return;
-               }
-
-               check_admin_referer( 'custom-background-upload', '_wpnonce-custom-background-upload' );
-               $overrides = array( 'test_form' => false );
-
-               $uploaded_file = $_FILES['import'];
-               $wp_filetype   = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
-               if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
-                       wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
-               }
-
-               $file = wp_handle_upload( $uploaded_file, $overrides );
-
-               if ( isset( $file['error'] ) ) {
-                       wp_die( $file['error'] );
-               }
-
-               $url      = $file['url'];
-               $type     = $file['type'];
-               $file     = $file['file'];
-               $filename = wp_basename( $file );
-
-               // Construct the object array
-               $object = array(
-                       'post_title'     => $filename,
-                       'post_content'   => $url,
-                       'post_mime_type' => $type,
-                       'guid'           => $url,
-                       'context'        => 'custom-background',
-               );
-
-               // Save the data
-               $id = wp_insert_attachment( $object, $file );
-
-               // Add the meta-data
-               wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-               update_post_meta( $id, '_wp_attachment_is_custom_background', get_option( 'stylesheet' ) );
-
-               set_theme_mod( 'background_image', esc_url_raw( $url ) );
-
-               $thumbnail = wp_get_attachment_image_src( $id, 'thumbnail' );
-               set_theme_mod( 'background_image_thumb', esc_url_raw( $thumbnail[0] ) );
-
-               /** This action is documented in wp-admin/includes/class-custom-image-header.php */
-               do_action( 'wp_create_file_in_uploads', $file, $id ); // For replication
-               $this->updated = true;
-       }
-
-       /**
-        * Ajax handler for adding custom background context to an attachment.
-        *
-        * Triggers when the user adds a new background image from the
-        * Media Manager.
-        *
-        * @since 4.1.0
-        */
-       public function ajax_background_add() {
-               check_ajax_referer( 'background-add', 'nonce' );
-
-               if ( ! current_user_can( 'edit_theme_options' ) ) {
-                       wp_send_json_error();
-               }
-
-               $attachment_id = absint( $_POST['attachment_id'] );
-               if ( $attachment_id < 1 ) {
-                       wp_send_json_error();
-               }
-
-               update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', get_stylesheet() );
-
-               wp_send_json_success();
-       }
-
-       /**
-        * @since 3.4.0
-        * @deprecated 3.5.0
-        *
-        * @param array $form_fields
-        * @return array $form_fields
-        */
-       public function attachment_fields_to_edit( $form_fields ) {
-               return $form_fields;
-       }
-
-       /**
-        * @since 3.4.0
-        * @deprecated 3.5.0
-        *
-        * @param array $tabs
-        * @return array $tabs
-        */
-       public function filter_upload_tabs( $tabs ) {
-               return $tabs;
-       }
-
-       /**
-        * @since 3.4.0
-        * @deprecated 3.5.0
-        */
-       public function wp_set_background_image() {
-               if ( ! current_user_can( 'edit_theme_options' ) || ! isset( $_POST['attachment_id'] ) ) {
-                       exit;
-               }
-               $attachment_id = absint( $_POST['attachment_id'] );
-               /** This filter is documented in wp-admin/includes/media.php */
-               $sizes = array_keys(
-                       apply_filters(
-                               'image_size_names_choose',
-                               array(
-                                       'thumbnail' => __( 'Thumbnail' ),
-                                       'medium'    => __( 'Medium' ),
-                                       'large'     => __( 'Large' ),
-                                       'full'      => __( 'Full Size' ),
-                               )
-                       )
-               );
-               $size  = 'thumbnail';
-               if ( in_array( $_POST['size'], $sizes ) ) {
-                       $size = esc_attr( $_POST['size'] );
-               }
-
-               update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', get_option( 'stylesheet' ) );
-               $url       = wp_get_attachment_image_src( $attachment_id, $size );
-               $thumbnail = wp_get_attachment_image_src( $attachment_id, 'thumbnail' );
-               set_theme_mod( 'background_image', esc_url_raw( $url[0] ) );
-               set_theme_mod( 'background_image_thumb', esc_url_raw( $thumbnail[0] ) );
-               exit;
-       }
-}
</del></span></pre></div>
<a id="trunksrcwpadmincustombackgroundphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-admin/custom-background.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/custom-background.php                          (rev 0)
+++ trunk/src/wp-admin/custom-background.php    2019-07-19 04:01:41 UTC (rev 45662)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,15 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Custom background script.
+ *
+ * This file is deprecated, use 'wp-admin/includes/class-custom-background.php' instead.
+ *
+ * @deprecated 5.3.0
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+_deprecated_file( basename( __FILE__ ), '5.3.0', 'wp-admin/includes/class-custom-background.php' );
+
+/** Custom_Background class */
+require_once( ABSPATH . 'wp-admin/includes/class-custom-background.php' );
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-admin/custom-background.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpadminincludesclasscustombackgroundphpfromrev45661trunksrcwpadmincustombackgroundphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/wp-admin/includes/class-custom-background.php (from rev 45661, trunk/src/wp-admin/custom-background.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-custom-background.php                           (rev 0)
+++ trunk/src/wp-admin/includes/class-custom-background.php     2019-07-19 04:01:41 UTC (rev 45662)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,606 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * The custom background script.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * The custom background class.
+ *
+ * @since 3.0.0
+ */
+class Custom_Background {
+
+       /**
+        * Callback for administration header.
+        *
+        * @var callable
+        * @since 3.0.0
+        */
+       public $admin_header_callback;
+
+       /**
+        * Callback for header div.
+        *
+        * @var callable
+        * @since 3.0.0
+        */
+       public $admin_image_div_callback;
+
+       /**
+        * Used to trigger a success message when settings updated and set to true.
+        *
+        * @since 3.0.0
+        * @var bool
+        */
+       private $updated;
+
+       /**
+        * Constructor - Register administration header callback.
+        *
+        * @since 3.0.0
+        * @param callable $admin_header_callback
+        * @param callable $admin_image_div_callback Optional custom image div output callback.
+        */
+       public function __construct( $admin_header_callback = '', $admin_image_div_callback = '' ) {
+               $this->admin_header_callback    = $admin_header_callback;
+               $this->admin_image_div_callback = $admin_image_div_callback;
+
+               add_action( 'admin_menu', array( $this, 'init' ) );
+
+               add_action( 'wp_ajax_custom-background-add', array( $this, 'ajax_background_add' ) );
+
+               // Unused since 3.5.0.
+               add_action( 'wp_ajax_set-background-image', array( $this, 'wp_set_background_image' ) );
+       }
+
+       /**
+        * Set up the hooks for the Custom Background admin page.
+        *
+        * @since 3.0.0
+        */
+       public function init() {
+               $page = add_theme_page( __( 'Background' ), __( 'Background' ), 'edit_theme_options', 'custom-background', array( $this, 'admin_page' ) );
+               if ( ! $page ) {
+                       return;
+               }
+
+               add_action( "load-$page", array( $this, 'admin_load' ) );
+               add_action( "load-$page", array( $this, 'take_action' ), 49 );
+               add_action( "load-$page", array( $this, 'handle_upload' ), 49 );
+
+               if ( $this->admin_header_callback ) {
+                       add_action( "admin_head-$page", $this->admin_header_callback, 51 );
+               }
+       }
+
+       /**
+        * Set up the enqueue for the CSS & JavaScript files.
+        *
+        * @since 3.0.0
+        */
+       public function admin_load() {
+               get_current_screen()->add_help_tab(
+                       array(
+                               'id'      => 'overview',
+                               'title'   => __( 'Overview' ),
+                               'content' =>
+                                       '<p>' . __( 'You can customize the look of your site without touching any of your theme&#8217;s code by using a custom background. Your background can be an image or a color.' ) . '</p>' .
+                                       '<p>' . __( 'To use a background image, simply upload it or choose an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '</p>' .
+                                       '<p>' . __( 'You can also choose a background color by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.' ) . '</p>' .
+                                       '<p>' . __( 'Don&#8217;t forget to click on the Save Changes button when you are finished.' ) . '</p>',
+                       )
+               );
+
+               get_current_screen()->set_help_sidebar(
+                       '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+                       '<p>' . __( '<a href="https://codex.wordpress.org/Appearance_Background_Screen">Documentation on Custom Background</a>' ) . '</p>' .
+                       '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+               );
+
+               wp_enqueue_media();
+               wp_enqueue_script( 'custom-background' );
+               wp_enqueue_style( 'wp-color-picker' );
+       }
+
+       /**
+        * Execute custom background modification.
+        *
+        * @since 3.0.0
+        */
+       public function take_action() {
+               if ( empty( $_POST ) ) {
+                       return;
+               }
+
+               if ( isset( $_POST['reset-background'] ) ) {
+                       check_admin_referer( 'custom-background-reset', '_wpnonce-custom-background-reset' );
+                       remove_theme_mod( 'background_image' );
+                       remove_theme_mod( 'background_image_thumb' );
+                       $this->updated = true;
+                       return;
+               }
+
+               if ( isset( $_POST['remove-background'] ) ) {
+                       // @TODO: Uploaded files are not removed here.
+                       check_admin_referer( 'custom-background-remove', '_wpnonce-custom-background-remove' );
+                       set_theme_mod( 'background_image', '' );
+                       set_theme_mod( 'background_image_thumb', '' );
+                       $this->updated = true;
+                       wp_safe_redirect( $_POST['_wp_http_referer'] );
+                       return;
+               }
+
+               if ( isset( $_POST['background-preset'] ) ) {
+                       check_admin_referer( 'custom-background' );
+
+                       if ( in_array( $_POST['background-preset'], array( 'default', 'fill', 'fit', 'repeat', 'custom' ), true ) ) {
+                               $preset = $_POST['background-preset'];
+                       } else {
+                               $preset = 'default';
+                       }
+
+                       set_theme_mod( 'background_preset', $preset );
+               }
+
+               if ( isset( $_POST['background-position'] ) ) {
+                       check_admin_referer( 'custom-background' );
+
+                       $position = explode( ' ', $_POST['background-position'] );
+
+                       if ( in_array( $position[0], array( 'left', 'center', 'right' ), true ) ) {
+                               $position_x = $position[0];
+                       } else {
+                               $position_x = 'left';
+                       }
+
+                       if ( in_array( $position[1], array( 'top', 'center', 'bottom' ), true ) ) {
+                               $position_y = $position[1];
+                       } else {
+                               $position_y = 'top';
+                       }
+
+                       set_theme_mod( 'background_position_x', $position_x );
+                       set_theme_mod( 'background_position_y', $position_y );
+               }
+
+               if ( isset( $_POST['background-size'] ) ) {
+                       check_admin_referer( 'custom-background' );
+
+                       if ( in_array( $_POST['background-size'], array( 'auto', 'contain', 'cover' ), true ) ) {
+                               $size = $_POST['background-size'];
+                       } else {
+                               $size = 'auto';
+                       }
+
+                       set_theme_mod( 'background_size', $size );
+               }
+
+               if ( isset( $_POST['background-repeat'] ) ) {
+                       check_admin_referer( 'custom-background' );
+
+                       $repeat = $_POST['background-repeat'];
+
+                       if ( 'no-repeat' !== $repeat ) {
+                               $repeat = 'repeat';
+                       }
+
+                       set_theme_mod( 'background_repeat', $repeat );
+               }
+
+               if ( isset( $_POST['background-attachment'] ) ) {
+                       check_admin_referer( 'custom-background' );
+
+                       $attachment = $_POST['background-attachment'];
+
+                       if ( 'fixed' !== $attachment ) {
+                               $attachment = 'scroll';
+                       }
+
+                       set_theme_mod( 'background_attachment', $attachment );
+               }
+
+               if ( isset( $_POST['background-color'] ) ) {
+                       check_admin_referer( 'custom-background' );
+                       $color = preg_replace( '/[^0-9a-fA-F]/', '', $_POST['background-color'] );
+                       if ( strlen( $color ) == 6 || strlen( $color ) == 3 ) {
+                               set_theme_mod( 'background_color', $color );
+                       } else {
+                               set_theme_mod( 'background_color', '' );
+                       }
+               }
+
+               $this->updated = true;
+       }
+
+       /**
+        * Display the custom background page.
+        *
+        * @since 3.0.0
+        */
+       public function admin_page() {
+               ?>
+<div class="wrap" id="custom-background">
+<h1><?php _e( 'Custom Background' ); ?></h1>
+
+               <?php if ( current_user_can( 'customize' ) ) { ?>
+<div class="notice notice-info hide-if-no-customize">
+       <p>
+                       <?php
+                               printf(
+                                       __( 'You can now manage and live-preview Custom Backgrounds in the <a href="%1$s">Customizer</a>.' ),
+                                       admin_url( 'customize.php?autofocus[control]=background_image' )
+                               );
+                       ?>
+       </p>
+</div>
+               <?php } ?>
+
+               <?php if ( ! empty( $this->updated ) ) { ?>
+<div id="message" class="updated">
+<p><?php printf( __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
+</div>
+               <?php } ?>
+
+<h2><?php _e( 'Background Image' ); ?></h2>
+
+<table class="form-table" role="presentation">
+<tbody>
+<tr>
+<th scope="row"><?php _e( 'Preview' ); ?></th>
+<td>
+               <?php
+               if ( $this->admin_image_div_callback ) {
+                       call_user_func( $this->admin_image_div_callback );
+               } else {
+                       $background_styles = '';
+                       $bgcolor           = get_background_color();
+                       if ( $bgcolor ) {
+                               $background_styles .= 'background-color: #' . $bgcolor . ';';
+                       }
+
+                       $background_image_thumb = get_background_image();
+                       if ( $background_image_thumb ) {
+                               $background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', $background_image_thumb ) ) ) );
+                               $background_position_x  = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
+                               $background_position_y  = get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) );
+                               $background_size        = get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) );
+                               $background_repeat      = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) );
+                               $background_attachment  = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
+
+                               // Background-image URL must be single quote, see below.
+                               $background_styles .= " background-image: url('$background_image_thumb');"
+                               . " background-size: $background_size;"
+                               . " background-position: $background_position_x $background_position_y;"
+                               . " background-repeat: $background_repeat;"
+                               . " background-attachment: $background_attachment;";
+                       }
+                       ?>
+       <div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // must be double quote, see above ?>
+                       <?php if ( $background_image_thumb ) { ?>
+               <img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" /><br />
+               <img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" />
+               <?php } ?>
+       </div>
+       <?php } ?>
+</td>
+</tr>
+
+               <?php if ( get_background_image() ) : ?>
+<tr>
+<th scope="row"><?php _e( 'Remove Image' ); ?></th>
+<td>
+<form method="post">
+                       <?php wp_nonce_field( 'custom-background-remove', '_wpnonce-custom-background-remove' ); ?>
+                       <?php submit_button( __( 'Remove Background Image' ), '', 'remove-background', false ); ?><br/>
+                       <?php _e( 'This will remove the background image. You will not be able to restore any customizations.' ); ?>
+</form>
+</td>
+</tr>
+               <?php endif; ?>
+
+               <?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?>
+               <?php if ( $default_image && get_background_image() != $default_image ) : ?>
+<tr>
+<th scope="row"><?php _e( 'Restore Original Image' ); ?></th>
+<td>
+<form method="post">
+                       <?php wp_nonce_field( 'custom-background-reset', '_wpnonce-custom-background-reset' ); ?>
+                       <?php submit_button( __( 'Restore Original Image' ), '', 'reset-background', false ); ?><br/>
+                       <?php _e( 'This will restore the original background image. You will not be able to restore any customizations.' ); ?>
+</form>
+</td>
+</tr>
+               <?php endif; ?>
+
+               <?php if ( current_user_can( 'upload_files' ) ) : ?>
+<tr>
+<th scope="row"><?php _e( 'Select Image' ); ?></th>
+<td><form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post">
+       <p>
+               <label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
+               <input type="file" id="upload" name="import" />
+               <input type="hidden" name="action" value="save" />
+                       <?php wp_nonce_field( 'custom-background-upload', '_wpnonce-custom-background-upload' ); ?>
+                       <?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
+       </p>
+       <p>
+               <label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
+               <button id="choose-from-library-link" class="button"
+                       data-choose="<?php esc_attr_e( 'Choose a Background Image' ); ?>"
+                       data-update="<?php esc_attr_e( 'Set as background' ); ?>"><?php _e( 'Choose Image' ); ?></button>
+       </p>
+       </form>
+</td>
+</tr>
+               <?php endif; ?>
+</tbody>
+</table>
+
+<h2><?php _e( 'Display Options' ); ?></h2>
+<form method="post">
+<table class="form-table" role="presentation">
+<tbody>
+               <?php if ( get_background_image() ) : ?>
+<input name="background-preset" type="hidden" value="custom">
+
+                       <?php
+                       $background_position = sprintf(
+                               '%s %s',
+                               get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) ),
+                               get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) )
+                       );
+
+                       $background_position_options = array(
+                               array(
+                                       'left top'   => array(
+                                               'label' => __( 'Top Left' ),
+                                               'icon'  => 'dashicons dashicons-arrow-left-alt',
+                                       ),
+                                       'center top' => array(
+                                               'label' => __( 'Top' ),
+                                               'icon'  => 'dashicons dashicons-arrow-up-alt',
+                                       ),
+                                       'right top'  => array(
+                                               'label' => __( 'Top Right' ),
+                                               'icon'  => 'dashicons dashicons-arrow-right-alt',
+                                       ),
+                               ),
+                               array(
+                                       'left center'   => array(
+                                               'label' => __( 'Left' ),
+                                               'icon'  => 'dashicons dashicons-arrow-left-alt',
+                                       ),
+                                       'center center' => array(
+                                               'label' => __( 'Center' ),
+                                               'icon'  => 'background-position-center-icon',
+                                       ),
+                                       'right center'  => array(
+                                               'label' => __( 'Right' ),
+                                               'icon'  => 'dashicons dashicons-arrow-right-alt',
+                                       ),
+                               ),
+                               array(
+                                       'left bottom'   => array(
+                                               'label' => __( 'Bottom Left' ),
+                                               'icon'  => 'dashicons dashicons-arrow-left-alt',
+                                       ),
+                                       'center bottom' => array(
+                                               'label' => __( 'Bottom' ),
+                                               'icon'  => 'dashicons dashicons-arrow-down-alt',
+                                       ),
+                                       'right bottom'  => array(
+                                               'label' => __( 'Bottom Right' ),
+                                               'icon'  => 'dashicons dashicons-arrow-right-alt',
+                                       ),
+                               ),
+                       );
+                       ?>
+<tr>
+<th scope="row"><?php _e( 'Image Position' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Image Position' ); ?></span></legend>
+<div class="background-position-control">
+                       <?php foreach ( $background_position_options as $group ) : ?>
+       <div class="button-group">
+                               <?php foreach ( $group as $value => $input ) : ?>
+               <label>
+                       <input class="screen-reader-text" name="background-position" type="radio" value="<?php echo esc_attr( $value ); ?>"<?php checked( $value, $background_position ); ?>>
+                       <span class="button display-options position"><span class="<?php echo esc_attr( $input['icon'] ); ?>" aria-hidden="true"></span></span>
+                       <span class="screen-reader-text"><?php echo $input['label']; ?></span>
+               </label>
+       <?php endforeach; ?>
+       </div>
+<?php endforeach; ?>
+</div>
+</fieldset></td>
+</tr>
+
+<tr>
+<th scope="row"><label for="background-size"><?php _e( 'Image Size' ); ?></label></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Image Size' ); ?></span></legend>
+<select id="background-size" name="background-size">
+<option value="auto"<?php selected( 'auto', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?>><?php _ex( 'Original', 'Original Size' ); ?></option>
+<option value="contain"<?php selected( 'contain', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?>><?php _e( 'Fit to Screen' ); ?></option>
+<option value="cover"<?php selected( 'cover', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?>><?php _e( 'Fill Screen' ); ?></option>
+</select>
+</fieldset></td>
+</tr>
+
+<tr>
+<th scope="row"><?php _ex( 'Repeat', 'Background Repeat' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _ex( 'Repeat', 'Background Repeat' ); ?></span></legend>
+<input name="background-repeat" type="hidden" value="no-repeat">
+<label><input type="checkbox" name="background-repeat" value="repeat"<?php checked( 'repeat', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) ); ?>> <?php _e( 'Repeat Background Image' ); ?></label>
+</fieldset></td>
+</tr>
+
+<tr>
+<th scope="row"><?php _ex( 'Scroll', 'Background Scroll' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _ex( 'Scroll', 'Background Scroll' ); ?></span></legend>
+<input name="background-attachment" type="hidden" value="fixed">
+<label><input name="background-attachment" type="checkbox" value="scroll" <?php checked( 'scroll', get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) ) ); ?>> <?php _e( 'Scroll with Page' ); ?></label>
+</fieldset></td>
+</tr>
+<?php endif; // get_background_image() ?>
+<tr>
+<th scope="row"><?php _e( 'Background Color' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Color' ); ?></span></legend>
+               <?php
+               $default_color = '';
+               if ( current_theme_supports( 'custom-background', 'default-color' ) ) {
+                       $default_color = ' data-default-color="#' . esc_attr( get_theme_support( 'custom-background', 'default-color' ) ) . '"';
+               }
+               ?>
+<input type="text" name="background-color" id="background-color" value="#<?php echo esc_attr( get_background_color() ); ?>"<?php echo $default_color; ?>>
+</fieldset></td>
+</tr>
+</tbody>
+</table>
+
+               <?php wp_nonce_field( 'custom-background' ); ?>
+               <?php submit_button( null, 'primary', 'save-background-options' ); ?>
+</form>
+
+</div>
+               <?php
+       }
+
+       /**
+        * Handle an Image upload for the background image.
+        *
+        * @since 3.0.0
+        */
+       public function handle_upload() {
+               if ( empty( $_FILES ) ) {
+                       return;
+               }
+
+               check_admin_referer( 'custom-background-upload', '_wpnonce-custom-background-upload' );
+               $overrides = array( 'test_form' => false );
+
+               $uploaded_file = $_FILES['import'];
+               $wp_filetype   = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
+               if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
+                       wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+               }
+
+               $file = wp_handle_upload( $uploaded_file, $overrides );
+
+               if ( isset( $file['error'] ) ) {
+                       wp_die( $file['error'] );
+               }
+
+               $url      = $file['url'];
+               $type     = $file['type'];
+               $file     = $file['file'];
+               $filename = wp_basename( $file );
+
+               // Construct the object array
+               $object = array(
+                       'post_title'     => $filename,
+                       'post_content'   => $url,
+                       'post_mime_type' => $type,
+                       'guid'           => $url,
+                       'context'        => 'custom-background',
+               );
+
+               // Save the data
+               $id = wp_insert_attachment( $object, $file );
+
+               // Add the meta-data
+               wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+               update_post_meta( $id, '_wp_attachment_is_custom_background', get_option( 'stylesheet' ) );
+
+               set_theme_mod( 'background_image', esc_url_raw( $url ) );
+
+               $thumbnail = wp_get_attachment_image_src( $id, 'thumbnail' );
+               set_theme_mod( 'background_image_thumb', esc_url_raw( $thumbnail[0] ) );
+
+               /** This action is documented in wp-admin/includes/class-custom-image-header.php */
+               do_action( 'wp_create_file_in_uploads', $file, $id ); // For replication
+               $this->updated = true;
+       }
+
+       /**
+        * Ajax handler for adding custom background context to an attachment.
+        *
+        * Triggers when the user adds a new background image from the
+        * Media Manager.
+        *
+        * @since 4.1.0
+        */
+       public function ajax_background_add() {
+               check_ajax_referer( 'background-add', 'nonce' );
+
+               if ( ! current_user_can( 'edit_theme_options' ) ) {
+                       wp_send_json_error();
+               }
+
+               $attachment_id = absint( $_POST['attachment_id'] );
+               if ( $attachment_id < 1 ) {
+                       wp_send_json_error();
+               }
+
+               update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', get_stylesheet() );
+
+               wp_send_json_success();
+       }
+
+       /**
+        * @since 3.4.0
+        * @deprecated 3.5.0
+        *
+        * @param array $form_fields
+        * @return array $form_fields
+        */
+       public function attachment_fields_to_edit( $form_fields ) {
+               return $form_fields;
+       }
+
+       /**
+        * @since 3.4.0
+        * @deprecated 3.5.0
+        *
+        * @param array $tabs
+        * @return array $tabs
+        */
+       public function filter_upload_tabs( $tabs ) {
+               return $tabs;
+       }
+
+       /**
+        * @since 3.4.0
+        * @deprecated 3.5.0
+        */
+       public function wp_set_background_image() {
+               if ( ! current_user_can( 'edit_theme_options' ) || ! isset( $_POST['attachment_id'] ) ) {
+                       exit;
+               }
+               $attachment_id = absint( $_POST['attachment_id'] );
+               /** This filter is documented in wp-admin/includes/media.php */
+               $sizes = array_keys(
+                       apply_filters(
+                               'image_size_names_choose',
+                               array(
+                                       'thumbnail' => __( 'Thumbnail' ),
+                                       'medium'    => __( 'Medium' ),
+                                       'large'     => __( 'Large' ),
+                                       'full'      => __( 'Full Size' ),
+                               )
+                       )
+               );
+               $size  = 'thumbnail';
+               if ( in_array( $_POST['size'], $sizes ) ) {
+                       $size = esc_attr( $_POST['size'] );
+               }
+
+               update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', get_option( 'stylesheet' ) );
+               $url       = wp_get_attachment_image_src( $attachment_id, $size );
+               $thumbnail = wp_get_attachment_image_src( $attachment_id, 'thumbnail' );
+               set_theme_mod( 'background_image', esc_url_raw( $url[0] ) );
+               set_theme_mod( 'background_image_thumb', esc_url_raw( $thumbnail[0] ) );
+               exit;
+       }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php   2019-07-19 03:49:26 UTC (rev 45661)
+++ trunk/src/wp-includes/theme.php     2019-07-19 04:01:41 UTC (rev 45662)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2617,7 +2617,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'wp_head', $args[0]['wp-head-callback'] );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_admin() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        require_once( ABSPATH . 'wp-admin/custom-background.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 require_once( ABSPATH . 'wp-admin/includes/class-custom-background.php' );
</ins><span class="cx" style="display: block; padding: 0 10px">                         $custom_background = new Custom_Background( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span></span></pre>
</div>
</div>

</body>
</html>