<!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>[29026] trunk/src/wp-admin: When accessing the Customizer from the admin menu, make sure the user is returned to the originating page upon close.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29026">29026</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-07-08 17:14:20 +0000 (Tue, 08 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>When accessing the Customizer from the admin menu, make sure the user is returned to the originating page upon close. We should still investigate the general usage of `customize-loader.js` moving forward, but this approach fixes the immediate issue. props westonruter. fixes <a href="http://core.trac.wordpress.org/ticket/25457">#25457</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincustomizephp">trunk/src/wp-admin/customize.php</a></li>
<li><a href="#trunksrcwpadminmenuphp">trunk/src/wp-admin/menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincustomizephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/customize.php (29025 => 29026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/customize.php 2014-07-08 17:03:48 UTC (rev 29025)
+++ trunk/src/wp-admin/customize.php 2014-07-08 17:14:20 UTC (rev 29026)
</span><span class="lines">@@ -12,16 +12,20 @@
</span><span class="cx"> /** Load WordPress Administration Bootstrap */
</span><span class="cx"> require_once( dirname( __FILE__ ) . '/admin.php' );
</span><span class="cx">
</span><del>-if ( ! current_user_can( 'edit_theme_options' ) )
</del><ins>+if ( ! current_user_can( 'edit_theme_options' ) ) {
</ins><span class="cx"> wp_die( __( 'Cheatin’ uh?' ) );
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> wp_reset_vars( array( 'url', 'return' ) );
</span><del>-$url = urldecode( $url );
</del><ins>+$url = wp_unslash( $url );
</ins><span class="cx"> $url = wp_validate_redirect( $url, home_url( '/' ) );
</span><del>-if ( $return )
- $return = wp_validate_redirect( urldecode( $return ) );
-if ( ! $return )
</del><ins>+if ( $return ) {
+ $return = wp_unslash( $return );
+ $return = wp_validate_redirect( $return );
+}
+if ( ! $return ) {
</ins><span class="cx"> $return = $url;
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> global $wp_scripts, $wp_customize;
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/menu.php (29025 => 29026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/menu.php 2014-07-08 17:03:48 UTC (rev 29025)
+++ trunk/src/wp-admin/menu.php 2014-07-08 17:14:20 UTC (rev 29026)
</span><span class="lines">@@ -146,9 +146,13 @@
</span><span class="cx">
</span><span class="cx"> $menu[60] = array( __('Appearance'), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
</span><span class="cx"> $submenu['themes.php'][5] = array( __( 'Themes' ), $appearance_cap, 'themes.php' );
</span><del>- $submenu['themes.php'][6] = array( __( 'Customize' ), 'edit_theme_options', 'customize.php', 'hide-if-no-customize' );
- if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
</del><ins>+
+ $customize_url = add_query_arg( 'return', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'customize.php' );
+ $submenu['themes.php'][6] = array( __( 'Customize' ), 'edit_theme_options', $customize_url, 'hide-if-no-customize' );
+ unset( $customize_url );
+ if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) {
</ins><span class="cx"> $submenu['themes.php'][10] = array(__( 'Menus' ), 'edit_theme_options', 'nav-menus.php');
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> unset( $appearance_cap );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>