Ticket #20862: 20862.diff

wp-includes/js/customize-loader.dev.js

@@ -54 +54 @@
                 hashchange: function( e ) {
                         var hash = window.location.toString().split('#')[1];
 
-                        if ( hash && 0 === hash.indexOf( 'customize=on' ) )
+                        if ( hash && 0 === hash.indexOf( 'wp_customize=on' ) )
                                 Loader.open( Loader.settings.url + '?' + hash );
 
                         if ( ! hash && ! $.support.history )
@@ -104 +104 @@
                         if ( $.support.history && window.location.href !== src )
                                 history.pushState( { customize: src }, '', src );
                         else if ( ! $.support.history && $.support.hashchange && hash )
-                                window.location.hash = 'customize=on&' + hash;
+                                window.location.hash = 'wp_customize=on&' + hash;
 
                         this.trigger( 'open' );
                 },

wp-includes/theme.php

@@ -1578 +1578 @@
 /**
  * Includes and instantiates the WP_Customize_Manager class.
  *
- * Fires when ?customize=on.
+ * Fires when ?wp_customize=on or on wp-admin/customize.php.
  *
  * @since 3.4.0
  */
 function _wp_customize_include() {
-        // Load on themes.php or ?customize=on
-        if ( ! ( ( isset( $_REQUEST['customize'] ) && 'on' == $_REQUEST['customize'] ) || 'customize.php' == basename( $_SERVER['PHP_SELF'] ) ) )
+        if ( ! ( ( isset( $_REQUEST['wp_customize'] ) && 'on' == $_REQUEST['wp_customize'] )
+                || ( is_admin() && 'customize.php' == basename( $_SERVER['PHP_SELF'] ) )
+        ) )
                 return;
 
         require( ABSPATH . WPINC . '/class-wp-customize-manager.php' );

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

@@ -586 +586 @@
                 }, {
                         query: function() {
                                 return {
-                                        customize:  'on',
-                                        theme:      api.settings.theme.stylesheet,
-                                        customized: JSON.stringify( api.get() )
+                                        wp_customize: 'on',
+                                        theme:        api.settings.theme.stylesheet,
+                                        customized:   JSON.stringify( api.get() )
                                 };
                         },