From 4d17b67eed359f6f35a45526597a4f70a91ba3e0 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Fri, 26 Aug 2016 09:58:28 +0000
Subject: [PATCH] Load: move `is_wp_error()` to `load.php` so that `WP_Error`
 is in a file by itself.

See #37827.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38304 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-error.php | 14 --------------
 wp-includes/load.php           | 14 ++++++++++++++
 wp-includes/version.php        |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/wp-includes/class-wp-error.php b/wp-includes/class-wp-error.php
index 1010adb047..22273f89b2 100644
--- a/wp-includes/class-wp-error.php
+++ b/wp-includes/class-wp-error.php
@@ -202,17 +202,3 @@ class WP_Error {
 		unset( $this->error_data[ $code ] );
 	}
 }
-
-/**
- * Check whether variable is a WordPress Error.
- *
- * Returns true if $thing is an object of the WP_Error class.
- *
- * @since 2.1.0
- *
- * @param mixed $thing Check if unknown variable is a WP_Error object.
- * @return bool True, if WP_Error. False, if not WP_Error.
- */
-function is_wp_error( $thing ) {
-	return ( $thing instanceof WP_Error );
-}
diff --git a/wp-includes/load.php b/wp-includes/load.php
index 403d460641..f6ae4b4c9f 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -1045,3 +1045,17 @@ function wp_doing_ajax() {
 	 */
 	return apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX );
 }
+
+/**
+ * Check whether variable is a WordPress Error.
+ *
+ * Returns true if $thing is an object of the WP_Error class.
+ *
+ * @since 2.1.0
+ *
+ * @param mixed $thing Check if unknown variable is a WP_Error object.
+ * @return bool True, if WP_Error. False, if not WP_Error.
+ */
+function is_wp_error( $thing ) {
+	return ( $thing instanceof WP_Error );
+}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0c530aa49d..89ca71661b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38362';
+$wp_version = '4.7-alpha-38363';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.