WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Theme Customizer: Use a more complex name for the save parameter to prevent the customizer from clashing with plugins. see #19910. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@20266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
koopersmith 2012-03-23 00:16:46 +00:00
parent b2d6004f17
commit 7ce012ef87
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/class-wp-customize.php
View File

@ -63,7 +63,7 @@ final class WP_Customize {
if ( ! isset( $_REQUEST['customize'] ) || 'on' != $_REQUEST['customize'] ) if ( ! isset( $_REQUEST['customize'] ) || 'on' != $_REQUEST['customize'] )
return; return;
if ( ! $this->set_stylesheet() || isset( $_REQUEST['save'] ) ) if ( ! $this->set_stylesheet() || isset( $_REQUEST['save_customize_controls'] ) )
return; return;
$this->previewing = true; $this->previewing = true;
@ -270,7 +270,7 @@ final class WP_Customize {
* @since 3.4.0 * @since 3.4.0
*/ */
public function admin_init() { public function admin_init() {
if ( isset( $_REQUEST['save'] ) ) if ( isset( $_REQUEST['save_customize_controls'] ) )
$this->save(); $this->save();
wp_enqueue_script( 'customize-loader' ); wp_enqueue_script( 'customize-loader' );

2
wp-includes/customize-controls.php
View File

@ -44,7 +44,7 @@ do_action( 'customize_controls_print_scripts' );
?> ?>
</head> </head>
<body class="wp-full-overlay"> <body class="wp-full-overlay">
<form id="customize-controls" method="post" class="wrap wp-full-overlay-sidebar" target="_parent" action="<?php echo esc_url( add_query_arg( 'save', '1', admin_url( 'themes.php' ) ) ); ?>"> <form id="customize-controls" method="post" class="wrap wp-full-overlay-sidebar" target="_parent" action="<?php echo esc_url( add_query_arg( 'save_customize_controls', '1', admin_url( 'themes.php' ) ) ); ?>">
<?php wp_nonce_field( 'customize_controls' ); ?> <?php wp_nonce_field( 'customize_controls' ); ?>
<input type="hidden" name="customize" value="on" /> <input type="hidden" name="customize" value="on" />
<input type="hidden" id="customize-template" name="template" value="<?php echo esc_attr( $theme['Template'] ); ?>" /> <input type="hidden" id="customize-template" name="template" value="<?php echo esc_attr( $theme['Template'] ); ?>" />