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

Add inline doc syntax fixes for `WP_Customize_Manager->doing_ajax()`. 

Also adds a return description.

See [31370]. See #31888.

Built from https://develop.svn.wordpress.org/trunk@32030


git-svn-id: http://core.svn.wordpress.org/trunk@32009 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-04-05 15:00:27 +00:00
parent f2a69e631c
commit a91a919d13
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/class-wp-customize-manager.php
View File

@ -117,10 +117,10 @@ final class WP_Customize_Manager {
* Return true if it's an AJAX request. * Return true if it's an AJAX request.
* *
* @since 3.4.0 * @since 3.4.0
* @since 4.2.0 Added $action param. * @since 4.2.0 Added `$action` param.
* *
* @param string|null $action whether the supplied Ajax action is being run. * @param string|null $action Whether the supplied AJAX action is being run.
* @return bool * @return bool True if it's an AJAX request, false otherwise.
*/ */
public function doing_ajax( $action = null ) { public function doing_ajax( $action = null ) {
$doing_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX ); $doing_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX );
@ -131,7 +131,10 @@ final class WP_Customize_Manager {
if ( ! $action ) { if ( ! $action ) {
return true; return true;
} else { } else {
// Note: we can't just use doing_action( "wp_ajax_{$action}" ) because we need to check before admin-ajax.php gets to that point /*
* Note: we can't just use doing_action( "wp_ajax_{$action}" ) because we need
* to check before admin-ajax.php gets to that point.
*/
return isset( $_REQUEST['action'] ) && wp_unslash( $_REQUEST['action'] ) === $action; return isset( $_REQUEST['action'] ) && wp_unslash( $_REQUEST['action'] ) === $action;
} }
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-beta4-32029'; $wp_version = '4.2-beta4-32030';
/** /**
* 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.