Changeset 25451

Timestamp:

09/16/2013 05:42:49 PM (11 years ago)

Author:

nacin

Message:

Always pass integer expirations to cache backends.

props SergeyBiryukov, andreasnrb.
fixes #25308.

Location:

trunk/src/wp-includes

Files:

• cache.php (modified) (8 diffs)
• option.php (modified) (2 diffs)

trunk/src/wp-includes/cache.php

@@ -22 +22 @@
  * @return bool False if cache key and group already exist, true on success
  */
-function wp_cache_add($key, $data, $group = '', $expire = 0) {
-    global $wp_object_cache;
-
-    return $wp_object_cache->add($key, $data, $group, $expire);
+function wp_cache_add( $key, $data, $group = '', $expire = 0 ) {
+    global $wp_object_cache;
+
+    return $wp_object_cache->add( $key, $data, $group, (int) $expire );
 }
 
@@ -155 +155 @@
  * @return bool False if not exists, true if contents were replaced
  */
-function wp_cache_replace($key, $data, $group = '', $expire = 0) {
-    global $wp_object_cache;
-
-    return $wp_object_cache->replace($key, $data, $group, $expire);
+function wp_cache_replace( $key, $data, $group = '', $expire = 0 ) {
+    global $wp_object_cache;
+
+    return $wp_object_cache->replace( $key, $data, $group, (int) $expire );
 }
 
@@ -174 +174 @@
  * @return bool False on failure, true on success
  */
-function wp_cache_set($key, $data, $group = '', $expire = 0) {
-    global $wp_object_cache;
-
-    return $wp_object_cache->set($key, $data, $group, $expire);
+function wp_cache_set( $key, $data, $group = '', $expire = 0 ) {
+    global $wp_object_cache;
+
+    return $wp_object_cache->set( $key, $data, $group, (int) $expire );
 }
 
@@ -321 +321 @@
      * @return bool False if cache key and group already exist, true on success
      */
-    function add( $key, $data, $group = 'default', $expire = '' ) {
+    function add( $key, $data, $group = 'default', $expire = 0 ) {
         if ( wp_suspend_cache_addition() )
             return false;
@@ -335 +335 @@
             return false;
 
-        return $this->set($key, $data, $group, $expire);
+        return $this->set( $key, $data, $group, (int) $expire );
     }
 
@@ -510 +510 @@
      * @return bool False if not exists, true if contents were replaced
      */
-    function replace( $key, $data, $group = 'default', $expire = '' ) {
+    function replace( $key, $data, $group = 'default', $expire = 0 ) {
         if ( empty( $group ) )
             $group = 'default';
@@ -521 +521 @@
             return false;
 
-        return $this->set( $key, $data, $group, $expire );
+        return $this->set( $key, $data, $group, (int) $expire );
     }
 
@@ -560 +560 @@
      * @return bool Always returns true
      */
-    function set($key, $data, $group = 'default', $expire = '') {
+    function set( $key, $data, $group = 'default', $expire = 0 ) {
         if ( empty( $group ) )
             $group = 'default';

trunk/src/wp-includes/option.php

@@ -491 +491 @@
 function set_transient( $transient, $value, $expiration = 0 ) {
     $value = apply_filters( 'pre_set_transient_' . $transient, $value );
+    $expiration = (int) $expiration;
 
     if ( wp_using_ext_object_cache() ) {
@@ -1050 +1051 @@
 function set_site_transient( $transient, $value, $expiration = 0 ) {
     $value = apply_filters( 'pre_set_site_transient_' . $transient, $value );
+    $expiration = (int) $expiration;
 
     if ( wp_using_ext_object_cache() ) {