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

Widget Customizer: Simplify conditions in setup_widget_addition_previews(). 

see #27534.
Built from https://develop.svn.wordpress.org/trunk@27820


git-svn-id: http://core.svn.wordpress.org/trunk@27654 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2014-03-28 17:09:15 +00:00
parent c2f839b7b6
commit 3a4d9c5953
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
wp-includes/class-wp-customize-widgets.php
View File

@ -118,31 +118,20 @@ final class WP_Customize_Widgets {
* @global WP_Customize_Manager $wp_customize
*/
public function setup_widget_addition_previews() {
$is_customize_preview = (
( ! empty( $this->manager ) )
&&
( ! is_admin() )
&&
( 'on' === $this->get_post_value( 'wp_customize' ) )
&&
check_ajax_referer( 'preview-customize_' . $this->manager->get_stylesheet(), 'nonce', false )
);
$is_customize_preview = false;
if ( ! empty( $this->manager ) && ! is_admin() && 'on' === $this->get_post_value( 'wp_customize' ) ) {
$is_customize_preview = check_ajax_referer( 'preview-customize_' . $this->manager->get_stylesheet(), 'nonce', false );
}
$is_ajax_widget_update = (
( defined( 'DOING_AJAX' ) && DOING_AJAX )
&&
$this->get_post_value( 'action' ) === 'update-widget'
&&
check_ajax_referer( 'update-widget', 'nonce', false )
);
$is_ajax_widget_update = false;
if ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-widget' === $this->get_post_value( 'action' ) ) {
$is_ajax_widget_update = check_ajax_referer( 'update-widget', 'nonce', false );
}
$is_ajax_customize_save = (
( defined( 'DOING_AJAX' ) && DOING_AJAX )
&&
$this->get_post_value( 'action' ) === 'customize_save'
&&
check_ajax_referer( 'save-customize_' . $this->manager->get_stylesheet(), 'nonce', false )
);
$is_ajax_customize_save = false;
if ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'customize_save' === $this->get_post_value( 'action' ) ) {
$is_ajax_customize_save = check_ajax_referer( 'save-customize_' . $this->manager->get_stylesheet(), 'nonce', false );
}
$is_valid_request = ( $is_ajax_widget_update || $is_customize_preview || $is_ajax_customize_save );
if ( ! $is_valid_request ) {