<!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>[20584] trunk/wp-includes/class-wp-customize.php: Theme Customizer: Preview the target theme during save to ensure all settings are properly registered.</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/20584">20584</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-04-25 15:44:06 +0000 (Wed, 25 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Customizer: Preview the target theme during save to ensure all settings are properly registered. Temporarily revert to the active theme when running switch_theme. fixes <a href="http://core.trac.wordpress.org/ticket/20508">#20508</a>, see <a href="http://core.trac.wordpress.org/ticket/19910">#19910</a>.
Introduces WP_Customize->start_previewing_theme() and WP_Customize->stop_previewing_theme() to easily enable/disable the theme filters as needed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpcustomizephp">trunk/wp-includes/class-wp-customize.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpcustomizephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-customize.php (20583 => 20584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize.php 2012-04-25 14:26:31 UTC (rev 20583)
+++ trunk/wp-includes/class-wp-customize.php 2012-04-25 15:44:06 UTC (rev 20584)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> require( ABSPATH . WPINC . '/class-wp-customize-section.php' );
</span><span class="cx"> require( ABSPATH . WPINC . '/class-wp-customize-control.php' );
</span><span class="cx">
</span><del>- add_action( 'setup_theme', array( $this, 'customize_previewing' ) );
</del><ins>+ add_action( 'setup_theme', array( $this, 'setup_theme' ) );
</ins><span class="cx"> add_action( 'admin_init', array( $this, 'admin_init' ) );
</span><span class="cx"> add_action( 'wp_loaded', array( $this, 'wp_loaded' ) );
</span><span class="cx">
</span><span class="lines">@@ -61,19 +61,38 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> */
</span><del>- public function customize_previewing() {
</del><ins>+ public function setup_theme() {
</ins><span class="cx"> if ( ! isset( $_REQUEST['customize'] ) || 'on' != $_REQUEST['customize'] )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( ! $this->set_theme() || isset( $_REQUEST['save_customize_controls'] ) )
</del><ins>+ $this->start_previewing_theme();
+ show_admin_bar( false );
+ }
+
+ /**
+ * Start previewing the selected theme.
+ *
+ * Adds filters to change the current theme.
+ *
+ * @since 3.4.0
+ */
+ public function start_previewing_theme() {
+ if ( $this->is_preview() || false === $this->theme || ( $this->theme && ! $this->theme->exists() ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- $this->previewing = true;
</del><ins>+ // Initialize $theme and $original_stylesheet if they do not yet exist.
+ if ( ! isset( $this->theme ) ) {
+ $this->theme = wp_get_theme( $_REQUEST['theme'] );
+ if ( ! $this->theme->exists() ) {
+ $this->theme = false;
+ return;
+ }
+ }
</ins><span class="cx">
</span><del>- show_admin_bar( false );
-
</del><span class="cx"> $this->original_stylesheet = get_stylesheet();
</span><span class="cx">
</span><ins>+ $this->previewing = true;
+
</ins><span class="cx"> add_filter( 'template', array( $this, 'get_template' ) );
</span><span class="cx"> add_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
</span><span class="cx"> add_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
</span><span class="lines">@@ -86,10 +105,38 @@
</span><span class="cx"> add_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
</span><span class="cx"> add_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );
</span><span class="cx">
</span><del>- do_action( 'customize_previewing' );
</del><ins>+ do_action( 'start_previewing_theme' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Stop previewing the selected theme.
+ *
+ * Removes filters to change the current theme.
+ *
+ * @since 3.4.0
+ */
+ public function stop_previewing_theme() {
+ if ( ! $this->is_preview() )
+ return;
+
+ $this->previewing = false;
+
+ remove_filter( 'template', array( $this, 'get_template' ) );
+ remove_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
+ remove_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
+
+ // @link: http://core.trac.wordpress.org/ticket/20027
+ remove_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
+ remove_filter( 'pre_option_template', array( $this, 'get_template' ) );
+
+ // Handle custom theme roots.
+ remove_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
+ remove_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );
+
+ do_action( 'stop_previewing_theme' );
+ }
+
+ /**
</ins><span class="cx"> * Register styles/scripts and initialize the preview of each setting
</span><span class="cx"> *
</span><span class="cx"> * @since 3.4.0
</span><span class="lines">@@ -160,24 +207,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Set the stylesheet name of the previewed theme.
- *
- * @since 3.4.0
- *
- * @return bool|string Stylesheet name.
- */
- public function set_theme() {
- if ( isset( $this->theme ) )
- return $this->theme;
-
- $this->theme = wp_get_theme( $_REQUEST['theme'] );
- if ( ! $this->theme->exists() )
- $this->theme = false;
-
- return $this->theme;
- }
-
- /**
</del><span class="cx"> * Retrieve the template name of the previewed theme.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.4.0
</span><span class="lines">@@ -267,23 +296,21 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> */
</span><span class="cx"> public function save() {
</span><del>- if ( $this->is_preview() )
</del><ins>+ if ( ! $this->is_preview() )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> check_admin_referer( 'customize_controls' );
</span><span class="cx">
</span><del>- if ( ! $this->set_theme() )
- return;
-
- $active_template = get_template();
- $active_stylesheet = get_stylesheet();
-
</del><span class="cx"> // Do we have to switch themes?
</span><del>- if ( $this->get_template() != $active_template || $this->get_stylesheet() != $active_stylesheet ) {
</del><ins>+ if ( $this->get_stylesheet() != $this->original_stylesheet ) {
</ins><span class="cx"> if ( ! current_user_can( 'switch_themes' ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // Temporarily stop previewing the theme to allow switch_themes()
+ // to operate properly.
+ $this->stop_previewing_theme();
</ins><span class="cx"> switch_theme( $this->get_template(), $this->get_stylesheet() );
</span><ins>+ $this->start_previewing_theme();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> do_action( 'customize_save' );
</span></span></pre>
</div>
</div>
</body>
</html>