WordPress 4.2.4-scripts

[autoinstalls/wordpress.git] / wp-includes / cache.php

diff --git a/wp-includes/cache.php b/wp-includes/cache.php
index 3cd344bb09ceb1125c7078d2b5a2b326775ec5f2..d75c82c669864cb597c1b191437d18db23aa26d4 100644 (file)
--- a/wp-includes/cache.php
+++ b/wp-includes/cache.php
@@ -2,7 +2,7 @@
 /**
  * Object Cache API
  *
 /**
  * Object Cache API
  *

- * @link http://codex.wordpress.org/Function_Reference/WP_Cache
+ * @link https://codex.wordpress.org/Function_Reference/WP_Cache

  *
  * @package WordPress
  * @subpackage Cache
  *
  * @package WordPress
  * @subpackage Cache


@@ -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 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
  */
  * @return bool|mixed False on failure to retrieve contents or the cache
  *             contents on success
  */


@@ -217,7 +217,6 @@ function wp_cache_add_global_groups( $groups ) {
  */
 function wp_cache_add_non_persistent_groups( $groups ) {
        // Default cache doesn't persist so nothing to do here.
  */
 function wp_cache_add_non_persistent_groups( $groups ) {
        // Default cache doesn't persist so nothing to do here.

-       return;

 }
 
 /**
 }
 
 /**


@@ -306,6 +305,15 @@ class WP_Object_Cache {
         */
        private $blog_prefix;
 
         */
        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.
         *
        /**
         * Make private properties readable for backwards compatibility.
         *


@@ -676,7 +684,6 @@ class WP_Object_Cache {
         * Sets up object properties; PHP 5 style constructor
         *
         * @since 2.0.8
         * Sets up object properties; PHP 5 style constructor
         *
         * @since 2.0.8

-        * @return null|WP_Object_Cache If cache is disabled, returns null.

         */
        public function __construct() {
                global $blog_id;
         */
        public function __construct() {
                global $blog_id;