Changeset 20852

Timestamp:

05/23/12 17:56:42 (2 years ago)

Author:

nacin

Message:

Customize API shuffling.

• Rename WP_Customize to WP_Customize_Manager.
• Move customize-controls.php to wp-admin/customize.php.
• Make customize.php the formal entry point, rather than admin.php?customize=on.
• Rename is_current_theme_active() to is_theme_active().
• Add getters for the theme, settings, controls, and sections properties.
• Allow customize.php (no ?theme=) to load the active theme. Not used yet.

see #20736.

Location:

trunk

Files:

• wp-admin/customize.php (moved) (moved from trunk/wp-includes/customize-controls.php) (8 diffs)
• wp-admin/includes/class-wp-plugins-list-table.php (modified) (1 diff)
• wp-includes/class-wp-customize-manager.php (moved) (moved from trunk/wp-includes/class-wp-customize.php) (9 diffs)
• wp-includes/theme.php (modified) (3 diffs)

trunk/wp-admin/customize.php

@@ -8 +8 @@
  */
 
-if ( ! defined( 'ABSPATH' ) )
-    die;
+require_once( './admin.php' );
+if ( ! current_user_can( 'edit_theme_options' ) )
+    die( 'Cap check failed' );
 
-global $wp_scripts;
+global $wp_scripts, $wp_customize;
+
+if ( ! $wp_customize->is_preview() )
+    die( 'is_preview() failed' );
+
+wp_reset_vars( array( 'theme' ) );
+
+if ( ! $theme )
+    $theme = get_stylesheet();
 
 $registered = $wp_scripts->registered;
@@ -34 +43 @@
 _wp_admin_html_begin();
 
-$admin_title = sprintf( __( '%1$s — WordPress' ), strip_tags( sprintf( __( 'Customize %s' ), $this->theme->display('Name') ) ) );
+$admin_title = sprintf( __( '%1$s — WordPress' ), strip_tags( sprintf( __( 'Customize %s' ), $wp_customize->theme()->display('Name') ) ) );
 ?><title><?php echo $admin_title; ?></title><?php
 
@@ -54 +63 @@
                 <div class="customize-section-title">
                     <span class="preview-notice"><?php _e('You are previewing'); ?></span>
-                    <strong class="theme-name"><?php echo $this->theme->display('Name'); ?></strong>
+                    <strong class="theme-name"><?php echo $wp_customize->theme()->display('Name'); ?></strong>
                 </div>
                 <div class="customize-section-content">
-                    <?php if ( $screenshot = $this->theme->get_screenshot() ) : ?>
+                    <?php if ( $screenshot = $wp_customize->theme()->get_screenshot() ) : ?>
                         <img class="theme-screenshot" src="<?php echo esc_url( $screenshot ); ?>" />
                     <?php endif; ?>
 
-                    <?php if ( $this->theme->get('Description') ): ?>
-                        <div class="theme-description"><?php echo $this->theme->display('Description'); ?></div>
+                    <?php if ( $wp_customize->theme()->get('Description') ): ?>
+                        <div class="theme-description"><?php echo $wp_customize->theme()->display('Description'); ?></div>
                     <?php endif; ?>
                 </div>
@@ -69 +78 @@
             <div id="customize-theme-controls"><ul>
                 <?php
-                foreach ( $this->sections as $section )
+                foreach ( $wp_customize->sections() as $section )
                     $section->maybe_render();
                 ?>
@@ -77 +86 @@
         <div id="customize-footer-actions" class="wp-full-overlay-footer">
             <?php
-            $save_text = $this->is_current_theme_active() ? __('Save') : __('Save and Activate');
+            $save_text = $wp_customize->is_theme_active() ? __('Save') : __('Save and Activate');
             submit_button( $save_text, 'primary', 'save', false );
             ?>
@@ -109 +118 @@
     $settings = array(
         'theme'    => array(
-            'stylesheet' => $this->get_stylesheet(),
-            'active'     => $this->is_current_theme_active(),
+            'stylesheet' => $wp_customize->get_stylesheet(),
+            'active'     => $wp_customize->is_theme_active(),
         ),
         'url'      => array(
@@ -121 +130 @@
     );
 
-    foreach ( $this->settings as $id => $setting ) {
+    foreach ( $wp_customize->settings() as $id => $setting ) {
         $settings['settings'][ $id ] = array(
             'value'     => $setting->js_value(),
@@ -128 +137 @@
     }
 
-    foreach ( $this->controls as $id => $control ) {
+    foreach ( $wp_customize->controls() as $id => $control ) {
         $control->to_json();
         $settings['controls'][ $id ] = $control->json;

trunk/wp-admin/includes/class-wp-plugins-list-table.php

@@ -70 +70 @@
                 foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
                     if ( isset( $current->response[ $plugin_file ] ) ) {
+                        ob_start();
+                        var_dump( $current->response[ $plugin_file ] );
+                        error_log( $plugin_file . ': ' . ob_get_clean() );
+                    }
+                    if ( ! empty( $current->response[ $plugin_file ] ) ) {
                         $plugins['all'][ $plugin_file ]['update'] = true;
                         $plugins['upgrade'][ $plugin_file ] = $plugins['all'][ $plugin_file ];

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

@@ -8 +8 @@
  */
 
-final class WP_Customize {
+final class WP_Customize_Manager {
     protected $theme;
     protected $original_stylesheet;
@@ -33 +33 @@
 
         add_action( 'setup_theme',  array( $this, 'setup_theme' ) );
-        add_action( 'admin_init',   array( $this, 'admin_init' ) );
         add_action( 'wp_loaded',    array( $this, 'wp_loaded' ) );
 
@@ -69 +68 @@
      */
     public function setup_theme() {
-        if ( ! isset( $_REQUEST['customize'] ) || 'on' != $_REQUEST['customize'] )
+        if ( ! ( isset( $_REQUEST['customize'] ) && 'on' == $_REQUEST['customize'] ) && ! basename( $_SERVER['PHP_SELF'] ) == 'customize.php' )
             return;
 
@@ -91 +90 @@
         // Initialize $theme and $original_stylesheet if they do not yet exist.
         if ( ! isset( $this->theme ) ) {
-            $this->theme = wp_get_theme( $_REQUEST['theme'] );
+            $this->theme = wp_get_theme( isset( $_REQUEST['theme'] ) ? $_REQUEST['theme'] : null );
             if ( ! $this->theme->exists() ) {
                 $this->theme = false;
@@ -146 +145 @@
 
     /**
+     * Generic getter.
+     *
+     * @since 3.4.0
+     *
+     * @return WP_Theme
+     */
+    public function __call( $callee, $args ) {
+        if ( in_array( $callee, array( 'theme', 'settings', 'controls', 'sections' ) ) )
+            return $this->$callee;
+    }
+
+    /**
      * Checks if the current theme is active.
      *
      * @since 3.4.0
-     */
-    public function is_current_theme_active() {
+     *
+     * @return bool
+     */
+    public function is_theme_active() {
         return $this->get_stylesheet() == $this->original_stylesheet;
     }
@@ -183 +196 @@
     }
 
-
     /**
      * Print javascript settings.
@@ -291 +303 @@
 
     /**
-     * Trigger save action and load customize controls.
-     *
-     * @since 3.4.0
-     */
-    public function admin_init() {
-        if ( ( defined( 'DOING_AJAX' ) && DOING_AJAX ) )
-            return;
-
-        if ( ! isset( $_GET['customize'] ) || 'on' != $_GET['customize'] )
-            return;
-
-        if ( empty( $_GET['theme'] ) )
-            return;
-
-        if ( ! $this->is_preview() )
-            return;
-
-        if ( ! current_user_can( 'edit_theme_options' ) )
-            return;
-
-        include( ABSPATH . WPINC . '/customize-controls.php' );
-
-        die;
-    }
-
-    /**
      * Switch the theme and trigger the save action of each setting.
      *
@@ -565 +551 @@
 
         $this->add_setting( 'header_textcolor', array(
-            // @todo: replace with a new accept() setting method
-            // 'sanitize_callback' => 'sanitize_hexcolor',
+            'sanitize_callback' => 'sanitize_header_textcolor',
             'theme_supports' => array( 'custom-header', 'header-text' ),
             'default'        => get_theme_support( 'custom-header', 'default-text-color' ),
@@ -794 +779 @@
 };
 
+// Callback function for sanitizing the header textcolor setting.
+function sanitize_header_textcolor( $color ) {
+    if ( empty( $color ) )
+        return get_theme_support( 'custom-header', 'default-text-color' );
+
+    elseif ( $color == 'blank' )
+        return 'blank';
+
+    return sanitize_hexcolor( $color );
+}
+
 // Callback function for sanitizing a hex color
 function sanitize_hexcolor( $color ) {

trunk/wp-includes/theme.php

@@ -1567 +1567 @@
 
 /**
- * Includes and instantiates the WP_Customize class.
+ * Includes and instantiates the WP_Customize_Manager class.
  *
  * Fires when ?customize=on.
@@ -1575 +1575 @@
 function _wp_customize_include() {
     // Load on themes.php or ?customize=on
-    if ( ! ( isset( $_REQUEST['customize'] ) && 'on' == $_REQUEST['customize'] ) )
+    if ( ! ( ( isset( $_REQUEST['customize'] ) && 'on' == $_REQUEST['customize'] ) || 'customize.php' == basename( $_SERVER['PHP_SELF'] ) ) )
         return;
 
-    require( ABSPATH . WPINC . '/class-wp-customize.php' );
+    require( ABSPATH . WPINC . '/class-wp-customize-manager.php' );
     // Init Customize class
-    $GLOBALS['wp_customize'] = new WP_Customize;
+    $GLOBALS['wp_customize'] = new WP_Customize_Manager;
 }
 add_action( 'plugins_loaded', '_wp_customize_include' );
@@ -1605 +1605 @@
  */
 function wp_customize_url( $stylesheet ) {
-    return esc_url( admin_url( 'admin.php' ) . '?customize=on&theme=' . $stylesheet );
-}
+    return esc_url( admin_url( 'customize.php' ) . '?theme=' . $stylesheet );
+}