From a91a919d13de38bcc6dc325ecf31ea647d3360a6 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sun, 5 Apr 2015 15:00:27 +0000
Subject: [PATCH] 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
---
 wp-includes/class-wp-customize-manager.php | 11 +++++++----
 wp-includes/version.php                    |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php
index 0baf2bc178..a61292732e 100644
--- a/wp-includes/class-wp-customize-manager.php
+++ b/wp-includes/class-wp-customize-manager.php
@@ -117,10 +117,10 @@ final class WP_Customize_Manager {
 	 * Return true if it's an AJAX request.
 	 *
 	 * @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.
-	 * @return bool
+	 * @param string|null $action Whether the supplied AJAX action is being run.
+	 * @return bool True if it's an AJAX request, false otherwise.
 	 */
 	public function doing_ajax( $action = null ) {
 		$doing_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX );
@@ -131,7 +131,10 @@ final class WP_Customize_Manager {
 		if ( ! $action ) {
 			return true;
 		} 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;
 		}
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6502022d49..d194d4ad2f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.