Changeset 27064

Timestamp:

02/01/2014 10:24:30 PM (11 years ago)

Author:

wonderboymusic

Message:

Remove $force argument from WP_Object_Cache::delete(). From @nacin: "This was for internal-use-only, I don't think _deprecated_argument() is needed, but let's put a comment somewhere just so we know we'd have to be careful if we ever want to add a third argument here later."

$force argument has been removed, and docs were updated.

Fixes #22478.

File:

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

trunk/src/wp-includes/cache.php

@@ -389 +389 @@
      * Remove the contents of the cache key in the group
      *
-     * If the cache key does not exist in the group and $force parameter is set
-     * to false, then nothing will happen. The $force parameter is set to false
-     * by default.
+     * If the cache key does not exist in the group, then nothing will happen.
+     * There used to be a 3rd param (bool $force Optional. Whether to
+     * force the unsetting of the cache key in the group).
      *
      * @since 2.0.0
@@ -397 +397 @@
      * @param int|string $key What the contents in the cache are called
      * @param string $group Where the cache contents are grouped
-     * @param bool $force Optional. Whether to force the unsetting of the cache
-     *      key in the group
+     *
      * @return bool False if the contents weren't deleted and true on success
      */
-    function delete($key, $group = 'default', $force = false) {
+    function delete( $key, $group = 'default' ) {
         if ( empty( $group ) )
             $group = 'default';
@@ -408 +407 @@
             $key = $this->blog_prefix . $key;
 
-        if ( ! $force && ! $this->_exists( $key, $group ) )
+        if ( ! $this->_exists( $key, $group ) )
             return false;