Changeset 27719

Timestamp:

03/25/2014 06:22:49 PM (11 years ago)

Author:

nacin

Message:

Transients: Allow a non-expiring transient to be updated with an expiry.

props shahpranaf, sandyr.
fixes #22807.

Location:

trunk

Files:

• src/wp-includes/option.php (modified) (1 diff)
• tests/phpunit/tests/option/transient.php (modified) (1 diff)

trunk/src/wp-includes/option.php

@@ -643 +643 @@
             $result = add_option( $transient, $value, '', $autoload );
         } else {
-            if ( $expiration )
-                update_option( $transient_timeout, time() + $expiration );
-            $result = update_option( $transient, $value );
+            // If expiration is requested, but the transient has no timeout option,
+            // delete, then re-create transient rather than update.
+            $update = true;
+            if ( $expiration ) {
+                if ( false === get_option( $transient_timeout ) ) {
+                    delete_option( $transient );
+                    add_option( $transient_timeout, time() + $expiration, '', 'no' );
+                    $result = add_option( $transient, $value, '', 'no' );
+                    $update = false;
+                } else {
+                    update_option( $transient_timeout, time() + $expiration );
+                }
+            }
+            if ( $update ) {
+                $result = update_option( $transient, $value );
+            }
         }
     }

trunk/tests/phpunit/tests/option/transient.php

@@ -34 +34 @@
         $this->assertTrue( delete_transient( $key ) );
     }
+
+    /**
+     * @ticket 22807
+     */
+    function test_transient_data_with_timeout() {
+        $key = rand_str();
+        $value = rand_str();
+        $value2 = rand_str();
+
+        $this->assertFalse( get_option( '_transient_timeout_' . $key ) );
+        $now = time();
+
+        $this->assertTrue( set_transient( $key, $value, 100 ) );
+
+        // Ensure the transient timeout is set for 100-101 seconds in the future.
+        $this->assertGreaterThanOrEqual( $now + 100, get_option( '_transient_timeout_' . $key ) );
+        $this->assertLessThanOrEqual( $now + 101, get_option( '_transient_timeout_' . $key ) );
+
+        // Update the timeout to a second in the past and watch the transient be invalidated.
+        update_option( '_transient_timeout_' . $key, $now - 1 );
+        $this->assertFalse( get_transient( $key ) );
+    }
+
+    /**
+     * @ticket 22807
+     */
+    function test_transient_add_timeout() {
+        $key = rand_str();
+        $value = rand_str();
+        $value2 = rand_str();
+        $this->assertTrue( set_transient( $key, $value ) );
+        $this->assertEquals( $value, get_transient( $key ) );
+
+        $this->assertFalse( get_option( '_transient_timeout_' . $key ) );
+
+        $now = time();
+        // Add timeout to existing timeout-less transient.
+        $this->assertTrue( set_transient( $key, $value2, 1 ) );
+        $this->assertGreaterThanOrEqual( $now, get_option( '_transient_timeout_' . $key ) );
+
+        update_option( '_transient_timeout_' . $key, $now - 1 );
+        $this->assertFalse( get_transient( $key ) );
+    }
 }