<!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>[20925] trunk/wp-includes: Theme Customizer: Add a signature to preview requests to be super-double-ultra-sure that the customizer generated the preview.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20925">20925</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-05-26 04:08:44 +0000 (Sat, 26 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Customizer: Add a signature to preview requests to be super-double-ultra-sure that the customizer generated the preview. Redirects can be sneaky. fixes <a href="http://core.trac.wordpress.org/ticket/20507">#20507</a>, see <a href="http://core.trac.wordpress.org/ticket/19910">#19910</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpcustomizemanagerphp">trunk/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunkwpincludesjscustomizecontrolsdevjs">trunk/wp-includes/js/customize-controls.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-customize-manager.php (20924 => 20925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize-manager.php 2012-05-26 03:52:14 UTC (rev 20924)
+++ trunk/wp-includes/class-wp-customize-manager.php 2012-05-26 04:08:44 UTC (rev 20925)
</span><span class="lines">@@ -264,6 +264,7 @@
</span><span class="cx"> wp_enqueue_script( 'customize-preview' );
</span><span class="cx"> add_action( 'wp_head', array( $this, 'customize_preview_base' ) );
</span><span class="cx"> add_action( 'wp_footer', array( $this, 'customize_preview_settings' ), 20 );
</span><ins>+ add_action( 'shutdown', array( $this, 'customize_preview_signature' ), 1000 );
</ins><span class="cx">
</span><span class="cx"> foreach ( $this->settings as $setting ) {
</span><span class="cx"> $setting->preview();
</span><span class="lines">@@ -303,6 +304,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Prints a signature so we can ensure the customizer was properly executed.
+ *
+ * @since 3.4.0
+ */
+ public function customize_preview_signature() {
+ echo 'WP_CUSTOMIZER_SIGNATURE';
+ }
+
+ /**
</ins><span class="cx"> * Is it a theme preview?
</span><span class="cx"> *
</span><span class="cx"> * @since 3.4.0
</span></span></pre></div>
<a id="trunkwpincludesjscustomizecontrolsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-controls.dev.js (20924 => 20925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-controls.dev.js 2012-05-26 03:52:14 UTC (rev 20924)
+++ trunk/wp-includes/js/customize-controls.dev.js 2012-05-26 04:08:44 UTC (rev 20925)
</span><span class="lines">@@ -405,7 +405,9 @@
</span><span class="cx"> data: this.query() || {},
</span><span class="cx"> success: function( response ) {
</span><span class="cx"> var iframe = self.loader()[0].contentWindow,
</span><del>- location = self.request.getResponseHeader('Location');
</del><ins>+ location = self.request.getResponseHeader('Location'),
+ signature = 'WP_CUSTOMIZER_SIGNATURE',
+ index;
</ins><span class="cx">
</span><span class="cx"> // Check if the location response header differs from the current URL.
</span><span class="cx"> // If so, the request was redirected; try loading the requested page.
</span><span class="lines">@@ -414,6 +416,14 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Check for a signature in the request.
+ index = response.lastIndexOf( signature );
+ if ( -1 === index || index < response.lastIndexOf('</html>') )
+ return;
+
+ // Strip the signature from the request.
+ response = response.slice( 0, index ) + response.slice( index + signature.length );
+
</ins><span class="cx"> self.loader().one( 'load', self.loaded );
</span><span class="cx">
</span><span class="cx"> iframe.document.open();
</span></span></pre>
</div>
</div>
</body>
</html>