<!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>[30885] trunk/src: Customizer: Add `_wp_attachment_is_custom_background` meta to uploaded background images.</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 { 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/30885">30885</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/30885","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-12-15 23:27:17 +0000 (Mon, 15 Dec 2014)</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'>Customizer: Add `_wp_attachment_is_custom_background` meta to uploaded background images.
Adds `$type` property to `WP_Customize_Background_Image_Control` (PHP) and introduces `wp.customize.BackgroundControl` (JS).
see <a href="https://core.trac.wordpress.org/ticket/30707">#30707</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpadmincustombackgroundphp">trunk/src/wp-admin/custom-background.php</a></li>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizecontrolphp">trunk/src/wp-includes/class-wp-customize-control.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscustomizecontrolscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/customize-controls.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/customize-controls.css 2014-12-15 23:19:06 UTC (rev 30884)
+++ trunk/src/wp-admin/css/customize-controls.css 2014-12-15 23:27:17 UTC (rev 30885)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,6 +581,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .current,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .current,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-background .current,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-header .current {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 8px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -610,6 +611,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .remove-button,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .default-button,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .upload-button,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-background .remove-button,
+.customize-control-background .default-button,
+.customize-control-background .upload-button,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-header button.new,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-header button.remove {
</span><span class="cx" style="display: block; padding: 0 10px"> white-space: normal;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -619,6 +623,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .current .container,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .current .container,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-background .current .container,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-header .current .container {
</span><span class="cx" style="display: block; padding: 0 10px"> overflow: hidden;
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-border-radius: 2px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -628,12 +633,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .current .container,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-background .current .container,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .current .container {
</span><span class="cx" style="display: block; padding: 0 10px"> min-height: 40px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .placeholder,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .placeholder,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-background .placeholder,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-header .placeholder {
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -643,6 +650,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .inner,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .inner,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-background .inner,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-header .inner {
</span><span class="cx" style="display: block; padding: 0 10px"> display: none;
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -654,6 +662,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .inner,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-background .inner,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .inner {
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> min-height: 40px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -661,6 +670,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .inner,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .inner,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-background .inner,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-header .inner,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-header .inner .dashicons {
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 20px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -777,6 +787,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .actions,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .actions,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-background .actions,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-header .actions {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 32px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -793,6 +804,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload img,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image img,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-background img,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-header img {
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-border-radius: 2px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -803,6 +815,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .default-button,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .remove-button,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .default-button,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-background .remove-button,
+.customize-control-background .default-button,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-header .remove {
</span><span class="cx" style="display: block; padding: 0 10px"> float: left;
</span><span class="cx" style="display: block; padding: 0 10px"> margin-right: 3px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -810,6 +824,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-upload .upload-button,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control-image .upload-button,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-background .upload-button,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-control-header .new {
</span><span class="cx" style="display: block; padding: 0 10px"> float: right;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadmincustombackgroundphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: 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 2014-12-15 23:19:06 UTC (rev 30884)
+++ trunk/src/wp-admin/custom-background.php 2014-12-15 23:27:17 UTC (rev 30885)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,6 +60,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->admin_image_div_callback = $admin_image_div_callback;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_menu', array( $this, 'init' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ add_action( 'wp_ajax_custom-background-add', array( $this, 'ajax_background_add' ) );
+
+ // Unused since 3.5.0.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_ajax_set-background-image', array( $this, 'wp_set_background_image' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,23 +468,53 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Unused since 3.5.0.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * AJAX handler for adding custom background context to an attachment.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Triggered 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();
+ }
+
+ /**
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated 3.5.0
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function attachment_fields_to_edit( $form_fields ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $form_fields;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Unused since 3.5.0.
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated 3.5.0
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function filter_upload_tabs( $tabs ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $tabs;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ *
+ * @since 3.4.0
+ * @deprecated 3.5.0
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function wp_set_background_image() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('edit_theme_options') || ! isset( $_POST['attachment_id'] ) ) exit;
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = absint($_POST['attachment_id']);
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizecontrolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-controls.js 2014-12-15 23:19:06 UTC (rev 30884)
+++ trunk/src/wp-admin/js/customize-controls.js 2014-12-15 23:27:17 UTC (rev 30885)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,4 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* globals _wpCustomizeHeader, _wpMediaViewsL10n */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* globals _wpCustomizeHeader, _wpCustomizeBackground, _wpMediaViewsL10n */
</ins><span class="cx" style="display: block; padding: 0 10px"> (function( exports, $ ){
</span><span class="cx" style="display: block; padding: 0 10px"> var Container, focus, api = wp.customize;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1144,10 +1144,44 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * A control for uploading background images.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @class
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @augments wp.customize.UploadControl
</ins><span class="cx" style="display: block; padding: 0 10px"> * @augments wp.customize.Control
</span><span class="cx" style="display: block; padding: 0 10px"> * @augments wp.customize.Class
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ api.BackgroundControl = api.UploadControl.extend({
+
+ /**
+ * When the control's DOM structure is ready,
+ * set up internal event bindings.
+ */
+ ready: function() {
+ api.UploadControl.prototype.ready.apply( this, arguments );
+ },
+
+ /**
+ * Callback handler for when an attachment is selected in the media modal.
+ * Does an additional AJAX request for setting the background context.
+ */
+ select: function() {
+ api.UploadControl.prototype.select.apply( this, arguments );
+
+ wp.ajax.post( 'custom-background-add', {
+ nonce: _wpCustomizeBackground.nonces.add,
+ wp_customize: 'on',
+ theme: api.settings.theme.stylesheet,
+ attachment_id: this.params.attachment.id
+ } );
+ }
+ });
+
+ /**
+ * @class
+ * @augments wp.customize.Control
+ * @augments wp.customize.Class
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> api.HeaderControl = api.Control.extend({
</span><span class="cx" style="display: block; padding: 0 10px"> ready: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> this.btnRemove = $('#customize-control-header_image .actions .remove');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1822,7 +1856,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> color: api.ColorControl,
</span><span class="cx" style="display: block; padding: 0 10px"> upload: api.UploadControl,
</span><span class="cx" style="display: block; padding: 0 10px"> image: api.ImageControl,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- header: api.HeaderControl
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ header: api.HeaderControl,
+ background: api.BackgroundControl
</ins><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px"> api.panelConstructor = {};
</span><span class="cx" style="display: block; padding: 0 10px"> api.sectionConstructor = {};
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizecontrolphp"></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/class-wp-customize-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-control.php 2014-12-15 23:19:06 UTC (rev 30884)
+++ trunk/src/wp-includes/class-wp-customize-control.php 2014-12-15 23:27:17 UTC (rev 30885)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -879,6 +879,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_Customize_Background_Image_Control extends WP_Customize_Image_Control {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $type = 'background';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Constructor.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -894,6 +895,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'background_image',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Enqueue control related scripts/styles.
+ *
+ * @since 4.1.0
+ */
+ public function enqueue() {
+ parent::enqueue();
+
+ wp_localize_script( 'customize-controls', '_wpCustomizeBackground', array(
+ 'nonces' => array(
+ 'add' => wp_create_nonce( 'background-add' ),
+ ),
+ ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -912,7 +928,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'data' => 'header_image_data',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'header_image',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'context' => 'custom-header',
</del><span class="cx" style="display: block; padding: 0 10px"> 'removed' => 'remove-header',
</span><span class="cx" style="display: block; padding: 0 10px"> 'get_url' => 'get_header_image',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></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/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2014-12-15 23:19:06 UTC (rev 30884)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2014-12-15 23:27:17 UTC (rev 30885)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -974,6 +974,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->register_control_type( 'WP_Customize_Color_Control' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->register_control_type( 'WP_Customize_Upload_Control' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->register_control_type( 'WP_Customize_Image_Control' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->register_control_type( 'WP_Customize_Background_Image_Control' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Site Title & Tagline */
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>