Changeset 20089

Timestamp:

03/02/12 21:10:37 (3 years ago)

Author:

ryan

Message:

Fix NULL and FALSE in WP_Object_Cache and make found/not-found unambiguous. Props andy. fixes #20004

File:

• trunk/wp-includes/cache.php (modified) (11 diffs)

trunk/wp-includes/cache.php

@@ -104 +104 @@
  * @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.
  * @return bool|mixed False on failure to retrieve contents or the cache
  *      contents on success
  */
-function wp_cache_get( $key, $group = '', $force = false ) {
-    global $wp_object_cache;
-
-    return $wp_object_cache->get( $key, $group, $force );
+function wp_cache_get( $key, $group = '', $force = false, &$found = null ) {
+    global $wp_object_cache;
+
+    return $wp_object_cache->get( $key, $group, $force, $found );
 }
 
@@ -273 +274 @@
      * Adds data to the cache if it doesn't already exist.
      *
-     * @uses WP_Object_Cache::get Checks to see if the cache already has data.
+     * @uses WP_Object_Cache::_exists Checks to see if the cache already has data.
      * @uses WP_Object_Cache::set Sets the data after the checking the cache
      *      contents existence.
@@ -289 +290 @@
             return false;
 
-        if ( empty ($group) )
+        if ( empty( $group ) )
             $group = 'default';
 
-        if (false !== $this->get($key, $group))
+        if ( $this->_exists($key, $group) )
             return false;
 
@@ -323 +324 @@
      */
     function decr( $key, $offset = 1, $group = 'default' ) {
-        if ( ! isset( $this->cache[ $group ][ $key ] ) )
+        if ( ! $this->_exists( $key, $group ) )
             return false;
 
@@ -355 +356 @@
      */
     function delete($key, $group = 'default', $force = false) {
-        if (empty ($group))
+        if ( empty( $group ) )
             $group = 'default';
 
-        if (!$force && false === $this->get($key, $group))
+        if ( ! $force && ! $this->_exists( $key, $group ) )
             return false;
 
-        unset ($this->cache[$group][$key]);
+        unset( $this->cache[$group][$key] );
         return true;
     }
@@ -395 +396 @@
      *      contents on success
      */
-    function get( $key, $group = 'default', $force = false) {
-        if ( empty ($group) )
+    function get( $key, $group = 'default', $force = false, &$found = null ) {
+        if ( empty( $group ) )
             $group = 'default';
 
-        if ( isset ($this->cache[$group][$key]) ) {
+        if ( $this->_exists( $key, $group ) ) {
+            $found = true;
             $this->cache_hits += 1;
             if ( is_object($this->cache[$group][$key]) )
@@ -407 +409 @@
         }
 
+        $found = false;
         $this->cache_misses += 1;
         return false;
@@ -422 +425 @@
      */
     function incr( $key, $offset = 1, $group = 'default' ) {
-        if ( ! isset( $this->cache[ $group ][ $key ] ) )
+        if ( empty( $group ) )
+            $group = 'default';
+
+        if ( ! $this->_exists( $key, $group ) )
             return false;
 
@@ -451 +457 @@
      */
     function replace($key, $data, $group = 'default', $expire = '') {
-        if (empty ($group))
+        if ( empty( $group ) )
             $group = 'default';
 
-        if ( false === $this->get($key, $group) )
+        if ( ! $this->_exists( $key, $group ) )
             return false;
 
@@ -494 +500 @@
      */
     function set($key, $data, $group = 'default', $expire = '') {
-        if ( empty ($group) )
+        if ( empty( $group ) )
             $group = 'default';
-
-        if ( null === $data )
-            $data = '';
 
         if ( is_object($data) )
@@ -528 +531 @@
 
     /**
+     * Utility function to determine whether a key exists in the cache.
+     * @access private
+     */
+    protected function _exists($key, $group) {
+        return is_array( $this->cache[$group] ) && array_key_exists( $key, $this->cache[$group] );
+    }
+
+    /**
      * Sets up object properties; PHP 5 style constructor
      *