From 2bcae51cfd2c7e7e1f1d45918b02bd720ca62f77 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Mon, 9 Mar 2015 02:18:27 +0000
Subject: [PATCH] Declare `multisite` as a field for `WP_Object_Cache`.

See #30799.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31663 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/cache.php   | 11 ++++++++++-
 wp-includes/version.php |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/wp-includes/cache.php b/wp-includes/cache.php
index f5ad2cc87c..79b038b5f6 100644
--- a/wp-includes/cache.php
+++ b/wp-includes/cache.php
@@ -103,7 +103,7 @@ function wp_cache_flush() {
  * @param int|string $key What the contents in the cache are called
  * @param string $group Where the cache contents are grouped
  * @param bool $force Whether to force an update of the local cache from the persistent cache (default is false)
- * @param &bool $found Whether key was found in the cache. Disambiguates a return of false, a storable value.
+ * @param bool &$found Whether key was found in the cache. Disambiguates a return of false, a storable value.
  * @return bool|mixed False on failure to retrieve contents or the cache
  *		contents on success
  */
@@ -305,6 +305,15 @@ class WP_Object_Cache {
 	 */
 	private $blog_prefix;
 
+	/**
+	 * Holds the value of `is_multisite()`
+	 *
+	 * @var bool
+	 * @access private
+	 * @since 3.5.0
+	 */
+	private $multisite;
+
 	/**
 	 * Make private properties readable for backwards compatibility.
 	 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1d9612900a..fe1bd93136 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31681';
+$wp_version = '4.2-alpha-31682';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.