Ticket #16274: 16274.diff

wp-includes/cache.php

@@ -206 +206 @@
         var $cache = array ();
 
         /**
-         * Cache objects that do not exist in the cache
-         *
-         * @var array
-         * @access private
-         * @since 2.0.0
-         */
-        var $non_existent_objects = array ();
-
-        /**
          * The amount of times the cache data was already stored in the cache.
          *
          * @since 2.5.0
@@ -287 +278 @@
          * to false, then nothing will happen. The $force parameter is set to false
          * by default.
          *
-         * On success the group and the id will be added to the
-         * $non_existent_objects property in the class.
-         *
          * @since 2.0.0
          *
          * @param int|string $id What the contents in the cache are called
@@ -306 +294 @@
                         return false;
 
                 unset ($this->cache[$group][$id]);
-                $this->non_existent_objects[$group][$id] = true;
                 return true;
         }
 
@@ -330 +317 @@
          * ID in the cache group. If the cache is hit (success) then the contents
          * are returned.
          *
-         * On failure, the $non_existent_objects property is checked and if the
-         * cache group and ID exist in there the cache misses will not be
-         * incremented. If not in the nonexistent objects property, then the cache
-         * misses will be incremented and the cache group and ID will be added to
-         * the nonexistent objects.
+         * On failure, the number of cache misses will be incremented.
          *
          * @since 2.0.0
          *
@@ -355 +338 @@
                                 return $this->cache[$group][$id];
                 }
 
-                if ( isset ($this->non_existent_objects[$group][$id]) )
-                        return false;
-
-                $this->non_existent_objects[$group][$id] = true;
                 $this->cache_misses += 1;
                 return false;
         }
@@ -429 +408 @@
                         $data = wp_clone($data);
 
                 $this->cache[$group][$id] = $data;
-
-                if ( isset($this->non_existent_objects[$group][$id]) )
-                        unset ($this->non_existent_objects[$group][$id]);
-
                 return true;
         }