Changeset 21028

Timestamp:

06/08/2012 06:45:12 PM (14 years ago)

Author:

ryan

Message:

Customizer: Redirect back to referrer. If referrer is a front end page, load that page in the customizer preview. Props nacin, koopersmith. fixes #20877

Location:

trunk

Files:

• wp-admin/customize.php (modified) (4 diffs)
• wp-admin/js/customize-controls.dev.js (modified) (4 diffs)
• wp-includes/admin-bar.php (modified) (1 diff)
• wp-includes/js/customize-base.dev.js (modified) (1 diff)

trunk/wp-admin/customize.php

@@ -11 +11 @@
 if ( ! current_user_can( 'edit_theme_options' ) )
         wp_die( __( 'Cheatin’ uh?' ) );
+
+wp_reset_vars( array( 'url', 'return' ) );
+$url = urldecode( $url );
+$url = wp_validate_redirect( $url, home_url( '/' ) );
+if ( $return )
+        $return = wp_validate_redirect( urldecode( $return ) );
+if ( ! $return )
+        $return = $url;
 
 global $wp_scripts, $wp_customize;
@@ -65 +73 @@
                         ?>
                         <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" />
-                        <a class="back button" href="<?php echo esc_url( admin_url( 'themes.php' ) ); ?>">
+                        <a class="back button" href="<?php echo esc_url( $return ? $return : admin_url( 'themes.php' ) ); ?>">
                                 <?php _e( 'Cancel' ); ?>
                         </a>
@@ -147 +155 @@
                 ),
                 'url'      => array(
-                        'preview'       => esc_url( home_url( '/' ) ),
+                        'preview'       => esc_url( $url ? $url : home_url( '/' ) ),
                         'parent'        => esc_url( admin_url() ),
                         'activated'     => esc_url( admin_url( 'themes.php?activated=true' ) ),
@@ -154 +162 @@
                         'isCrossDomain' => $cross_domain,
                         'fallback'      => $fallback_url,
+                        'home'          => esc_url( home_url( '/' ) ),
                 ),
                 'browser'  => array(

trunk/wp-admin/js/customize-controls.dev.js

@@ -404 +404 @@
                 initialize: function( params, options ) {
                         var self = this,
-                                rscheme = /^https?/;
+                                rscheme = /^https?/,
+                                url;
 
                         $.extend( this, options || {} );
@@ -445 +446 @@
                         this.allowedUrls = params.allowedUrls;
 
+                        url = params.url;
+                        delete params.url;
+
                         api.Messenger.prototype.initialize.call( this, params );
 
@@ -489 +493 @@
                         });
 
-                        // Refresh the preview when the URL is changed.
+                        // Set the url.
+                        this.url( url );
+
+                        // Refresh the preview when the URL is changed (but not yet).
                         this.url.bind( this.refresh );
 
@@ -636 +643 @@
                 });
 
-                // Load the preview frame.
-                previewer.refresh();
+                // Check if preview url is valid and load the preview frame.
+                if ( previewer.url() )
+                        previewer.refresh();
+                else
+                        previewer.url( api.settings.url.home );
 
                 // Save and activated states

trunk/wp-includes/admin-bar.php

@@ -577 +577 @@
                 return;
 
+        $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
         $wp_admin_bar->add_menu( array(
                 'parent' => 'appearance',
                 'id'     => 'customize',
                 'title'  => __('Customize'),
-                'href'   => wp_customize_url(),
+                'href'   => add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() ),
                 'meta'   => array(
                         'class' => 'hide-if-no-customize',

trunk/wp-includes/js/customize-base.dev.js

@@ -499 +499 @@
 
                         this.add( 'channel', params.channel );
-                        this.add( 'url', params.url );
+                        this.add( 'url', params.url || '' );
                         this.add( 'targetWindow', params.targetWindow || defaultTarget );
                         this.add( 'origin', this.url() ).link( this.url ).setter( function( to ) {