Changeset 21016

Timestamp:

06/07/2012 01:29:57 AM (13 years ago)

Author:

ryan

Message:

Namespace the customize request arg to prevent collision with plugins and themes. Props nacin. fixes #20862

Location:

trunk

Files:

• wp-admin/js/customize-controls.dev.js (modified) (1 diff)
• wp-includes/js/customize-loader.dev.js (modified) (2 diffs)
• wp-includes/theme.php (modified) (1 diff)

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

@@ -587 +587 @@
             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() )
                 };
             },

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

@@ -55 +55 @@
             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 );
 
@@ -105 +105 @@
                 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' );

trunk/wp-includes/theme.php

@@ -1579 +1579 @@
  * 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;