<!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>[21016] trunk: Namespace the customize request arg to prevent collision with plugins and themes.</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/21016">21016</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-06-07 01:29:57 +0000 (Thu, 07 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Namespace the customize request arg to prevent collision with plugins and themes. Props nacin. fixes <a href="http://core.trac.wordpress.org/ticket/20862">#20862</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjscustomizecontrolsdevjs">trunk/wp-admin/js/customize-controls.dev.js</a></li>
<li><a href="#trunkwpincludesjscustomizeloaderdevjs">trunk/wp-includes/js/customize-loader.dev.js</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjscustomizecontrolsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/customize-controls.dev.js (21015 => 21016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/customize-controls.dev.js 2012-06-06 21:51:13 UTC (rev 21015)
+++ trunk/wp-admin/js/customize-controls.dev.js 2012-06-07 01:29:57 UTC (rev 21016)
</span><span class="lines">@@ -586,9 +586,9 @@
</span><span class="cx"> }, {
</span><span class="cx"> query: function() {
</span><span class="cx"> return {
</span><del>- customize: 'on',
- theme: api.settings.theme.stylesheet,
- customized: JSON.stringify( api.get() )
</del><ins>+ wp_customize: 'on',
+ theme: api.settings.theme.stylesheet,
+ customized: JSON.stringify( api.get() )
</ins><span class="cx"> };
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesjscustomizeloaderdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-loader.dev.js (21015 => 21016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-loader.dev.js 2012-06-06 21:51:13 UTC (rev 21015)
+++ trunk/wp-includes/js/customize-loader.dev.js 2012-06-07 01:29:57 UTC (rev 21016)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> hashchange: function( e ) {
</span><span class="cx"> var hash = window.location.toString().split('#')[1];
</span><span class="cx">
</span><del>- if ( hash && 0 === hash.indexOf( 'customize=on' ) )
</del><ins>+ if ( hash && 0 === hash.indexOf( 'wp_customize=on' ) )
</ins><span class="cx"> Loader.open( Loader.settings.url + '?' + hash );
</span><span class="cx">
</span><span class="cx"> if ( ! hash && ! $.support.history )
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> if ( $.support.history && window.location.href !== src )
</span><span class="cx"> history.pushState( { customize: src }, '', src );
</span><span class="cx"> else if ( ! $.support.history && $.support.hashchange && hash )
</span><del>- window.location.hash = 'customize=on&' + hash;
</del><ins>+ window.location.hash = 'wp_customize=on&' + hash;
</ins><span class="cx">
</span><span class="cx"> this.trigger( 'open' );
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (21015 => 21016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2012-06-06 21:51:13 UTC (rev 21015)
+++ trunk/wp-includes/theme.php 2012-06-07 01:29:57 UTC (rev 21016)
</span><span class="lines">@@ -1578,13 +1578,14 @@
</span><span class="cx"> /**
</span><span class="cx"> * Includes and instantiates the WP_Customize_Manager class.
</span><span class="cx"> *
</span><del>- * Fires when ?customize=on.
</del><ins>+ * Fires when ?wp_customize=on or on wp-admin/customize.php.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> */
</span><span class="cx"> function _wp_customize_include() {
</span><del>- // Load on themes.php or ?customize=on
- if ( ! ( ( isset( $_REQUEST['customize'] ) && 'on' == $_REQUEST['customize'] ) || 'customize.php' == basename( $_SERVER['PHP_SELF'] ) ) )
</del><ins>+ if ( ! ( ( isset( $_REQUEST['wp_customize'] ) && 'on' == $_REQUEST['wp_customize'] )
+ || ( is_admin() && 'customize.php' == basename( $_SERVER['PHP_SELF'] ) )
+ ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> require( ABSPATH . WPINC . '/class-wp-customize-manager.php' );
</span></span></pre>
</div>
</div>
</body>
</html>