<!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>[29903] trunk/src: Customizer: Change instances of "Theme Customizer" to just "Customizer", as the Customizer isn't necessarily theme-specific.</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/29903">29903</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/29903","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-10-15 17:20:34 +0000 (Wed, 15 Oct 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: Change instances of "Theme Customizer" to just "Customizer", as the Customizer isn't necessarily theme-specific.
Also capitalize "Customizer".
See also https://make.wordpress.org/core/2014/07/08/customizer-improvements-in-4-0/.
props studionashvegas, tareq1988.
fixes <a href="https://core.trac.wordpress.org/ticket/29947">#29947</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincustomizephp">trunk/src/wp-admin/customize.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpadminjscustomizewidgetsjs">trunk/src/wp-admin/js/customize-widgets.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenincthemeoptionsphp">trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteeninccustomizerphp">trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteenjscolorschemecontroljs">trunk/src/wp-content/themes/twentyfifteen/js/color-scheme-control.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteenjscustomizerjs">trunk/src/wp-content/themes/twentyfifteen/js/customizer.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenincbackcompatphp">trunk/src/wp-content/themes/twentyfourteen/inc/back-compat.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomizerphp">trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp">trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenjscustomizerjs">trunk/src/wp-content/themes/twentyfourteen/js/customizer.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteenincbackcompatphp">trunk/src/wp-content/themes/twentythirteen/inc/back-compat.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteenjsthemecustomizerjs">trunk/src/wp-content/themes/twentythirteen/js/theme-customizer.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvejsthemecustomizerjs">trunk/src/wp-content/themes/twentytwelve/js/theme-customizer.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>
<li><a href="#trunksrcwpincludesclasswpcustomizewidgetsphp">trunk/src/wp-includes/class-wp-customize-widgets.php</a></li>
<li><a href="#trunksrcwpincludesjscustomizeloaderjs">trunk/src/wp-includes/js/customize-loader.js</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsphp">trunk/src/wp-includes/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincustomizephp"></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/customize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/customize.php 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-admin/customize.php 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,10 +129,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cannot_expand = ! ( $wp_customize->is_theme_active() || $screenshot || $wp_customize->theme()->get('Description') );
</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">- <div id="widgets-right"><!-- For Widget Customizer, many widgets try to look for instances under div#widgets-right, so we have to add that ID to a container div in the customizer for compat -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="widgets-right"><!-- For Widget Customizer, many widgets try to look for instances under div#widgets-right, so we have to add that ID to a container div in the Customizer for compat -->
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-full-overlay-sidebar-content accordion-container" tabindex="-1">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="customize-info" class="accordion-section <?php if ( $cannot_expand ) echo ' cannot-expand'; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="accordion-section-title" aria-label="<?php esc_attr_e( 'Theme Customizer Options' ); ?>" tabindex="0">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="accordion-section-title" aria-label="<?php esc_attr_e( 'Customizer Options' ); ?>" tabindex="0">
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="preview-notice"><?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_customize->is_theme_active() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s is the theme name in the Customize/Live Preview pane */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,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"> * If the frontend and the admin are served from the same domain, load the
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * preview over ssl if the customizer is being loaded over ssl. This avoids
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * preview over ssl if the Customizer is being loaded over ssl. This avoids
</ins><span class="cx" style="display: block; padding: 0 10px"> * insecure content warnings. This is not attempted if the admin and frontend
</span><span class="cx" style="display: block; padding: 0 10px"> * are on different domains to avoid the case where the frontend doesn't have
</span><span class="cx" style="display: block; padding: 0 10px"> * ssl certs. Domain mapping plugins can allow other urls in these conditions
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,7 +226,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize-login' => 1
</span><span class="cx" style="display: block; padding: 0 10px"> ), wp_login_url() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Prepare customizer settings to pass to Javascript.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prepare Customizer settings to pass to Javascript.
</ins><span class="cx" style="display: block; padding: 0 10px"> $settings = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'stylesheet' => $wp_customize->get_stylesheet(),
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></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/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-admin/includes/template.php 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2029,7 +2029,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"> $content = '<h3>' . __( 'New Feature: Live Widget Previews' ) . '</h3>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content .= '<p>' . __( 'Add, edit, and play around with your widgets from the theme customizer.' ) . ' ' . __( 'Preview your changes in real-time and only save them when you’re ready.' ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content .= '<p>' . __( 'Add, edit, and play around with your widgets from the Customizer.' ) . ' ' . __( 'Preview your changes in real-time and only save them when you’re ready.' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'themes' === get_current_screen()->id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $selector = '.theme.active .customize';
</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-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-admin/js/customize-controls.js 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -832,7 +832,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Limit the URL to internal, front-end links.
</span><span class="cx" style="display: block; padding: 0 10px"> //
</span><span class="cx" style="display: block; padding: 0 10px"> // If the frontend and the admin are served from the same domain, load the
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // preview over ssl if the customizer is being loaded over ssl. This avoids
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // preview over ssl if the Customizer is being loaded over ssl. This avoids
</ins><span class="cx" style="display: block; padding: 0 10px"> // insecure content warnings. This is not attempted if the admin and frontend
</span><span class="cx" style="display: block; padding: 0 10px"> // are on different domains to avoid the case where the frontend doesn't have
</span><span class="cx" style="display: block; padding: 0 10px"> // ssl certs.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -984,7 +984,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> api.settings = window._wpCustomizeSettings;
</span><span class="cx" style="display: block; padding: 0 10px"> api.l10n = window._wpCustomizeControlsL10n;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Check if we can run the customizer.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check if we can run the Customizer.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! api.settings )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizewidgetsjs"></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-widgets.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-widgets.js 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-admin/js/customize-widgets.js 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -691,7 +691,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Highlight widgets in preview when interacted with in the customizer
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Highlight widgets in preview when interacted with in the Customizer
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> _setupHighlightEffects: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var self = this;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1494,7 +1494,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Expand other customizer sidebar section when dragging a control widget over it,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Expand other Customizer sidebar section when dragging a control widget over it,
</ins><span class="cx" style="display: block; padding: 0 10px"> * allowing the control to be dropped into another section
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> this.$controlSection.find( '.accordion-section-title' ).droppable({
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenincthemeoptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,11 +499,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'body_class', 'twentyeleven_layout_classes' );
</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">- * Implements Twenty Eleven theme options into Theme Customizer
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Implements Twenty Eleven theme options into Customizer
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Eleven 1.3
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param object $wp_customize Theme Customizer object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param object $wp_customize Customizer object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyeleven_customize_register( $wp_customize ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -533,7 +533,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 5,
</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">- // Link Color (added to Color Scheme section in Theme Customizer)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Link Color (added to Color Scheme section in Customizer)
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting( 'twentyeleven_theme_options[link_color]', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => twentyeleven_get_default_link_color( $options['color_scheme'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'option',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -574,7 +574,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'customize_register', 'twentyeleven_customize_register' );
</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">- * Bind JS handlers to make Theme Customizer preview reload changes asynchronously.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Bind JS handlers to make Customizer preview reload changes asynchronously.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Used with blogname and blogdescription.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteeninccustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Twenty Fifteen Theme Customizer.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Twenty Fifteen Customizer.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @package WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage Twenty_Fifteen
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,11 +8,11 @@
</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">- * Add postMessage support for site title and description for the Theme Customizer.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Add postMessage support for site title and description for the Customizer.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param WP_Customize_Manager $wp_customize Theme Customizer object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Customize_Manager $wp_customize Customizer object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_customize_register( $wp_customize ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $color_scheme = twentyfifteen_get_color_scheme();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -650,7 +650,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', 'twentyfifteen_color_scheme_css' );
</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">- * Binds JS handlers to make Theme Customizer preview reload changes asynchronously.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Binds JS handlers to make Customizer preview reload changes asynchronously.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteenjscolorschemecontroljs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/js/color-scheme-control.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/js/color-scheme-control.js 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-content/themes/twentyfifteen/js/color-scheme-control.js 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* global colorScheme */
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Theme Customizer enhancements for a better user experience.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Customizer enhancements for a better user experience.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Adds listener to Color Scheme control to update other color controls with new values/defaults
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteenjscustomizerjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/js/customizer.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/js/customizer.js 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-content/themes/twentyfifteen/js/customizer.js 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Theme Customizer enhancements for a better user experience.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Customizer enhancements for a better user experience.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Contains handlers to make Theme Customizer preview reload changes asynchronously.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Contains handlers to make Customizer preview reload changes asynchronously.
</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"> ( function( $ ) {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/functions.php 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -505,7 +505,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Custom template tags for this theme.
</span><span class="cx" style="display: block; padding: 0 10px"> require get_template_directory() . '/inc/template-tags.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Add Theme Customizer functionality.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Add Customizer functionality.
</ins><span class="cx" style="display: block; padding: 0 10px"> require get_template_directory() . '/inc/customizer.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenincbackcompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/inc/back-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/back-compat.php 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/back-compat.php 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Prevent the Theme Customizer from being loaded on WordPress versions prior to 3.6.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Prevent the Customizer from being loaded on WordPress versions prior to 3.6.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fourteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninccustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Twenty Fourteen Theme Customizer support
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Twenty Fourteen Customizer support
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @package WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage Twenty_Fourteen
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,11 +8,11 @@
</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">- * Implement Theme Customizer additions and adjustments.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Implement Customizer additions and adjustments.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fourteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param WP_Customize_Manager $wp_customize Theme Customizer object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Customize_Manager $wp_customize Customizer object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfourteen_customize_register( $wp_customize ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add postMessage support for site title and description.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Bind JS handlers to make Theme Customizer preview reload changes asynchronously.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Bind JS handlers to make Customizer preview reload changes asynchronously.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fourteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +97,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Hide "featured" tag from the front-end.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Has to run on wp_loaded so that the preview filters of the customizer
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Has to run on wp_loaded so that the preview filters of the Customizer
</ins><span class="cx" style="display: block; padding: 0 10px"> * have a chance to alter the value.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @static
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,7 +396,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fourteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param WP_Customize_Manager $wp_customize Theme Customizer object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Customize_Manager $wp_customize Customizer object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function customize_register( $wp_customize ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_section( 'featured_content', array(
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenjscustomizerjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/js/customizer.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/js/customizer.js 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-content/themes/twentyfourteen/js/customizer.js 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Twenty Fourteen Theme Customizer enhancements for a better user experience.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Twenty Fourteen Customizer enhancements for a better user experience.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Contains handlers to make Theme Customizer preview reload changes asynchronously.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Contains handlers to make Customizer preview reload changes asynchronously.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> ( function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Site title and description.
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteenincbackcompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/inc/back-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/inc/back-compat.php 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-content/themes/twentythirteen/inc/back-compat.php 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Prevent the Theme Customizer from being loaded on WordPress versions prior to 3.6.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Prevent the Customizer from being loaded on WordPress versions prior to 3.6.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Thirteen 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteenjsthemecustomizerjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/js/theme-customizer.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/js/theme-customizer.js 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-content/themes/twentythirteen/js/theme-customizer.js 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Theme Customizer enhancements for a better user experience.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Customizer enhancements for a better user experience.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Contains handlers to make Theme Customizer preview reload changes asynchronously.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Contains handlers to make Customizer preview reload changes asynchronously.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Things like site title and description changes.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvejsthemecustomizerjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/js/theme-customizer.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/js/theme-customizer.js 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-content/themes/twentytwelve/js/theme-customizer.js 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Theme Customizer enhancements for a better user experience.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Customizer enhancements for a better user experience.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Contains handlers to make Theme Customizer preview reload changes asynchronously.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Contains handlers to make Customizer preview reload changes asynchronously.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Things like site title, description, and background color changes.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</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-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-includes/class-wp-customize-control.php 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function enqueue() {}
</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">- * Check whether control is active to current customizer preview.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Check whether control is active to current Customizer preview.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</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-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected $previewing = false;
</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">- * Methods and properties deailing with managing widgets in the customizer.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Methods and properties deailing with managing widgets in the Customizer.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var WP_Customize_Widgets
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Run wp_redirect_status late to make sure we override the status last.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_redirect_status', array( $this, 'wp_redirect_status' ), 1000 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Do not spawn cron (especially the alternate cron) while running the customizer.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Do not spawn cron (especially the alternate cron) while running the Customizer.
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'init', 'wp_cron' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Do not run update checks when rendering the controls.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,7 +516,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Prints a signature so we can ensure the customizer was properly executed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Prints a signature so we can ensure the Customizer was properly executed.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,7 +525,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Removes the signature in case we experience a case where the customizer was not properly executed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Removes the signature in case we experience a case where the Customizer was not properly executed.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</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></pre></div>
<a id="trunksrcwpincludesclasswpcustomizewidgetsphp"></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-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-widgets.php 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-includes/class-wp-customize-widgets.php 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Set up widget addition previews.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Since the widgets get registered on 'widgets_init' before the customizer
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Since the widgets get registered on 'widgets_init' before the Customizer
</ins><span class="cx" style="display: block; padding: 0 10px"> * settings are set up on 'customize_register', we have to filter the options
</span><span class="cx" style="display: block; padding: 0 10px"> * similarly to how the setting previewer will filter the options later.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- // Input from customizer preview.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Input from Customizer preview.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['customized'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_customized = json_decode( $this->get_post_value( 'customized' ), true );
</span><span class="cx" style="display: block; padding: 0 10px"> } else { // Input from ajax widget update request.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,7 +201,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Ensure that newly-added widgets will appear in the widgets_sidebars.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * This is necessary because the customizer's setting preview filters
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This is necessary because the Customizer's setting preview filters
</ins><span class="cx" style="display: block; padding: 0 10px"> * are added after the widgets_init action, which is too late for the
</span><span class="cx" style="display: block; padding: 0 10px"> * widgets to be set up properly.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +225,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Ensure newly-added widgets have empty instances so they
</span><span class="cx" style="display: block; padding: 0 10px"> * will be recognized.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * This is necessary because the customizer's setting preview
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This is necessary because the Customizer's setting preview
</ins><span class="cx" style="display: block; padding: 0 10px"> * filters are added after the widgets_init action, which is
</span><span class="cx" style="display: block; padding: 0 10px"> * too late for the widgets to be set up properly.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,7 +287,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Override sidebars_widgets for theme switch.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * When switching a theme via the customizer, supply any previously-configured
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * When switching a theme via the Customizer, supply any previously-configured
</ins><span class="cx" style="display: block; padding: 0 10px"> * sidebars_widgets from the target theme as the initial sidebars_widgets
</span><span class="cx" style="display: block; padding: 0 10px"> * setting. Also store the old theme's existing settings so that they can
</span><span class="cx" style="display: block; padding: 0 10px"> * be passed along for storing in the sidebars_widgets theme_mod when the
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,7 +313,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filter old_sidebars_widgets_data customizer setting.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filter old_sidebars_widgets_data Customizer setting.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * When switching themes, filter the Customizer setting
</span><span class="cx" style="display: block; padding: 0 10px"> * old_sidebars_widgets_data to supply initial $sidebars_widgets before they
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,7 +388,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Register customizer settings and controls for all sidebars and widgets.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Register Customizer settings and controls for all sidebars and widgets.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -534,7 +534,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Covert a widget_id into its corresponding customizer setting ID (option name).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Covert a widget_id into its corresponding Customizer setting ID (option name).
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,9 +556,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Determine whether the widget is considered "wide".
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Core widgets which may have controls wider than 250, but can
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * still be shown in the narrow customizer panel. The RSS and Text
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * still be shown in the narrow Customizer panel. The RSS and Text
</ins><span class="cx" style="display: block; padding: 0 10px"> * widgets in Core, for example, have widths of 400 and yet they
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * still render fine in the customizer panel. This method will
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * still render fine in the Customizer panel. This method will
</ins><span class="cx" style="display: block; padding: 0 10px"> * return all Core widgets as being not wide, but this can be
</span><span class="cx" style="display: block; padding: 0 10px"> * overridden with the is_wide_widget_in_customizer filter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -664,7 +664,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Enqueue scripts and styles for customizer panel and export data to JavaScript.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Enqueue scripts and styles for Customizer panel and export data to JavaScript.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -964,7 +964,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Add hooks for the customizer preview.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Add hooks for the Customizer preview.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -982,7 +982,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Because wp_get_sidebars_widgets() gets called early at init
</span><span class="cx" style="display: block; padding: 0 10px"> * (via wp_convert_widget_settings()) and can set global variable
</span><span class="cx" style="display: block; padding: 0 10px"> * $_wp_sidebars_widgets to the value of get_option( 'sidebars_widgets' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * before the customizer preview filter is added, we have to reset
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * before the Customizer preview filter is added, we have to reset
</ins><span class="cx" style="display: block; padding: 0 10px"> * it after the filter has been added.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.9.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1039,7 +1039,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function export_preview_data() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Prepare customizer settings to pass to Javascript.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prepare Customizer settings to pass to Javascript.
</ins><span class="cx" style="display: block; padding: 0 10px"> $settings = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'renderedSidebars' => array_fill_keys( array_unique( $this->rendered_sidebars ), true ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'renderedWidgets' => array_fill_keys( array_keys( $this->rendered_widgets ), true ),
</span></span></pre></div>
<a id="trunksrcwpincludesjscustomizeloaderjs"></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/js/customize-loader.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/customize-loader.js 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-includes/js/customize-loader.js 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * By default, any element in the body with the load-customize class will open
</span><span class="cx" style="display: block; padding: 0 10px"> * an iframe overlay with the URL specified.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * e.g. <a class="load-customize" href="<?php echo wp_customize_url(); ?>">Open customizer</a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * e.g. <a class="load-customize" href="<?php echo wp_customize_url(); ?>">Open Customizer</a>
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @augments wp.customize.Events
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $('#wpbody').on( 'click', '.load-customize', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Store a reference to the link that opened the customizer.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Store a reference to the link that opened the Customizer.
</ins><span class="cx" style="display: block; padding: 0 10px"> Loader.link = $(this);
</span><span class="cx" style="display: block; padding: 0 10px"> // Load the theme.
</span><span class="cx" style="display: block; padding: 0 10px"> Loader.open( Loader.link.attr('href') );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Open the customizer overlay for a specific URL.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Open the Customizer overlay for a specific URL.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string src URL to load in the Customizer.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.active = true;
</span><span class="cx" style="display: block; padding: 0 10px"> this.body.addClass('customize-loading');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Dirty state of customizer in iframe
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Dirty state of Customizer in iframe
</ins><span class="cx" style="display: block; padding: 0 10px"> this.saved = new api.Value( true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.iframe = $( '<iframe />', { src: src }).appendTo( this.element );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +170,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Callback after the customizer has been opened.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Callback after the Customizer has been opened.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> opened: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> Loader.body.addClass( 'customize-active full-overlay-active' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +184,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- // Display AYS dialog if customizer is dirty
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Display AYS dialog if Customizer is dirty
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! this.saved() && ! confirm( Loader.settings.l10n.saveAlert ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Go forward since Customizer is exited by history.back()
</span><span class="cx" style="display: block; padding: 0 10px"> history.forward();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Callback after the customizer has been closed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Callback after the Customizer has been closed.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> closed: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> Loader.iframe.remove();
</span></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 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-includes/theme.php 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -804,9 +804,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_option( "theme_mods_$stylesheet", $default_theme_mods );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Since retrieve_widgets() is called when initializing the customizer theme,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Since retrieve_widgets() is called when initializing a theme in the Customizer,
</ins><span class="cx" style="display: block; padding: 0 10px"> * we need to to remove the theme mods to avoid overwriting changes made via
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * the widget customizer when accessing wp-admin/widgets.php.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * the Customizer when accessing wp-admin/widgets.php.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'wp_ajax_customize_save' === current_action() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> remove_theme_mod( 'sidebars_widgets' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1946,7 +1946,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_enqueue_scripts', '_wp_customize_loader_settings' );
</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">- * Returns a URL to load the theme customizer.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns a URL to load the Customizer.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1961,7 +1961,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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Prints a script to check whether or not the customizer is supported,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Prints a script to check whether or not the Customizer is supported,
</ins><span class="cx" style="display: block; padding: 0 10px"> * and apply either the no-customize-support or customize-support class
</span><span class="cx" style="display: block; padding: 0 10px"> * to the body.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsphp"></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/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets.php 2014-10-15 16:39:19 UTC (rev 29902)
+++ trunk/src/wp-includes/widgets.php 2014-10-15 17:20:34 UTC (rev 29903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1406,7 +1406,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $theme_changed Whether the theme was changed as a boolean. A value
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * of 'customize' defers updates for the customizer.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * of 'customize' defers updates for the Customizer.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function retrieve_widgets( $theme_changed = false ) {
</span></span></pre>
</div>
</div>
</body>
</html>