Changeset 20496 for trunk/wp-includes/class-wp-customize.php

Timestamp:

04/17/2012 09:43:47 PM (14 years ago)

Author:

nacin

Message:

Move to admin.php?customize=on&theme=$stylesheet, rather than juggling both template and stylesheet values. see #19910.

Combine the setup_theme() and customize_previewing() methods. Remove the set_template() and set_stylesheet() methods. Add set_theme() method to WP_Customize to store the working WP_Theme object. We will use this for the stylesheet and template.

Use the WP_Theme display() method when preparing headers for display, not get() or the deprecate properties.

File:

• trunk/wp-includes/class-wp-customize.php (modified) (13 diffs)

trunk/wp-includes/class-wp-customize.php

@@ -9 +9 @@
 
 final class WP_Customize {
-    protected $template;
-    protected $stylesheet;
-    protected $original_template;
+    protected $theme;
     protected $original_stylesheet;
 
@@ -30 +28 @@
         require( ABSPATH . WPINC . '/class-wp-customize-control.php' );
 
-        add_action( 'setup_theme',  array( $this, 'setup_theme' ) );
+        add_action( 'setup_theme',  array( $this, 'customize_previewing' ) );
         add_action( 'admin_init',   array( $this, 'admin_init' ) );
         add_action( 'wp_loaded',    array( $this, 'wp_loaded' ) );
 
-        add_action( 'customize_previewing',               array( $this, 'customize_previewing' ) );
         add_action( 'customize_register',                 array( $this, 'register_controls' ) );
         add_action( 'customize_controls_init',            array( $this, 'prepare_controls' ) );
@@ -60 +57 @@
     /**
      * Start preview and customize theme.
-     * Check if customize query variable exist.
-     *
-     * @since 3.4.0
-     */
-    public function setup_theme() {
+     *
+     * Check if customize query variable exist. Init filters to filter the current theme.
+     *
+     * @since 3.4.0
+     */
+    public function customize_previewing() {
         if ( ! isset( $_REQUEST['customize'] ) || 'on' != $_REQUEST['customize'] )
             return;
 
-        if ( ! $this->set_stylesheet() || isset( $_REQUEST['save_customize_controls'] ) )
+        if ( ! $this->set_theme() || isset( $_REQUEST['save_customize_controls'] ) )
             return;
 
         $this->previewing = true;
-        do_action( 'customize_previewing' );
-    }
-
-    /**
-     * Init filters to filter theme options.
-     *
-     * @since 3.4.0
-     */
-    public function customize_previewing() {
-        global $wp_theme_directories;
 
         show_admin_bar( false );
 
-        $this->original_template   = get_template();
         $this->original_stylesheet = get_stylesheet();
 
@@ -97 +84 @@
 
         // Handle custom theme roots.
-        if ( count( $wp_theme_directories ) > 1 ) {
-            add_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
-            add_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );
-        }
+        add_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
+        add_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );
+
+        do_action( 'customize_previewing' );
     }
 
@@ -174 +161 @@
 
     /**
-     * Set the template name of the previewed theme.
-     *
-     * @since 3.4.0
-     *
-     * @return bool|string Template name.
-     */
-    public function set_template() {
-        if ( ! empty( $this->template ) )
-            return $this->template;
-
-        $template = preg_replace('|[^a-z0-9_./-]|i', '', $_REQUEST['template'] );
-        if ( validate_file( $template ) )
-            return false;
-
-        return $this->template = $template;
-    }
-
-    /**
      * Set the stylesheet name of the previewed theme.
      *
@@ -198 +167 @@
      * @return bool|string Stylesheet name.
      */
-    public function set_stylesheet() {
-        if ( ! empty( $this->stylesheet ) )
-            return $this->stylesheet;
-
-        $this->set_template();
-        if ( empty( $this->template ) )
-            return false;
-
-        if ( empty( $_REQUEST['stylesheet'] ) ) {
-            $stylesheet = $this->template;
-        } else {
-            $stylesheet = preg_replace( '|[^a-z0-9_./-]|i', '', $_REQUEST['stylesheet'] );
-            if ( $stylesheet != $this->template && validate_file( $stylesheet ) )
-                return false;
-        }
-        return $this->stylesheet = $stylesheet;
-
+    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;
     }
 
@@ -225 +186 @@
      */
     public function get_template() {
-        return $this->template;
+        return $this->theme->get_template();
     }
 
@@ -236 +197 @@
      */
     public function get_stylesheet() {
-        return $this->stylesheet;
+        return $this->theme->get_stylesheet();
     }
 
@@ -247 +208 @@
      */
     public function get_template_root() {
-        return get_raw_theme_root( $this->template, true );
+        return get_raw_theme_root( $this->get_template(), true );
     }
 
@@ -258 +219 @@
      */
     public function get_stylesheet_root() {
-        return get_raw_theme_root( $this->stylesheet, true );
+        return get_raw_theme_root( $this->get_stylesheet(), true );
     }
 
@@ -269 +230 @@
      */
     public function current_theme( $current_theme ) {
-        return wp_get_theme( $this->stylesheet )->get('Name');
+        return $this->theme->display('Name');
     }
 
@@ -287 +248 @@
             return;
 
+        if ( empty( $_GET['theme'] ) )
+            return;
+
         if ( ! $this->is_preview() )
             return;
@@ -309 +273 @@
         check_admin_referer( 'customize_controls' );
 
-        if ( ! $this->set_stylesheet() )
+        if ( ! $this->set_theme() )
             return;