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

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
This commit is contained in:
Weston Ruter 2015-09-25 19:36:25 +00:00
parent 6f81ec0a2a
commit aedb4c3ee2
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/theme.php
View File

@ -1897,8 +1897,11 @@ function check_theme_switched() {
/** /**
* Includes and instantiates the WP_Customize_Manager class. * Includes and instantiates the WP_Customize_Manager class.
* *
* Fires on a preview frame request (when ?wp_customize=on is in the URL) and * Loads the Customizer at plugins_loaded when accessing the customize.php admin
* on the Customizer interface page (wp-admin/customize.php). * 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 * @since 3.4.0
* *
@ -1907,8 +1910,9 @@ function check_theme_switched() {
function _wp_customize_include() { function _wp_customize_include() {
if ( ! ( ( isset( $_REQUEST['wp_customize'] ) && 'on' == $_REQUEST['wp_customize'] ) if ( ! ( ( isset( $_REQUEST['wp_customize'] ) && 'on' == $_REQUEST['wp_customize'] )
|| ( is_admin() && 'customize.php' == basename( $_SERVER['PHP_SELF'] ) ) || ( is_admin() && 'customize.php' == basename( $_SERVER['PHP_SELF'] ) )
) ) ) ) {
return; return;
}
require_once ABSPATH . WPINC . '/class-wp-customize-manager.php'; require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
$GLOBALS['wp_customize'] = new WP_Customize_Manager(); $GLOBALS['wp_customize'] = new WP_Customize_Manager();

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.