From aedb4c3ee26e0564f4d1a191315c6ab69b960576 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Fri, 25 Sep 2015 19:36:25 +0000 Subject: [PATCH] Customizer: Flesh out phpdoc description for `_wp_customize_include()`. Also add brackets around single-statement inline `if` statement. Fixes #33488. Built from https://develop.svn.wordpress.org/trunk@34554 git-svn-id: http://core.svn.wordpress.org/trunk@34518 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/theme.php | 10 +++++++--- wp-includes/version.php | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/wp-includes/theme.php b/wp-includes/theme.php index 130b90e645..906da5176f 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -1897,8 +1897,11 @@ function check_theme_switched() { /** * Includes and instantiates the WP_Customize_Manager class. * - * Fires on a preview frame request (when ?wp_customize=on is in the URL) and - * on the Customizer interface page (wp-admin/customize.php). + * Loads the Customizer at plugins_loaded when accessing the customize.php admin + * page or when any request includes a wp_customize=on param, either as a GET + * query var or as POST data. This param is a signal for whether to bootstrap + * the Customizer when WordPress is loading, especially in the Customizer preview + * or when making Customizer Ajax requests for widgets or menus. * * @since 3.4.0 * @@ -1907,8 +1910,9 @@ function check_theme_switched() { function _wp_customize_include() { if ( ! ( ( isset( $_REQUEST['wp_customize'] ) && 'on' == $_REQUEST['wp_customize'] ) || ( is_admin() && 'customize.php' == basename( $_SERVER['PHP_SELF'] ) ) - ) ) + ) ) { return; + } require_once ABSPATH . WPINC . '/class-wp-customize-manager.php'; $GLOBALS['wp_customize'] = new WP_Customize_Manager(); diff --git a/wp-includes/version.php b/wp-includes/version.php index d4a80805c2..bbb0200951 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34553'; +$wp_version = '4.4-alpha-34554'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.