Ticket #22807: 22807.diff

src/wp-includes/option.php

@@ -642 +642 @@
                         }
                         $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.
+                         */
+                        $skipupdate = false;
+                        if ( $expiration ) {
+                                if ( false === get_option( $transient_timeout ) ) {
+                                        delete_option( $transient );
+                                        add_option( $transient_timeout, time() + $expiration, '', 'no' );
+                                        $result = add_option( $transient, $value, '', 'no' );
+                                        $skipupdate = true;
+                                } else {
+                                        update_option( $transient_timeout, time() + $expiration );
+                                }
+                        }
+                        if ( false === $skipupdate ) {
+                                $result = update_option( $transient, $value );
+                        }
                 }
         }
 

tests/phpunit/tests/option/transient.php

@@ -33 +33 @@
                 $this->assertEquals( $value, get_transient( $key ) );
                 $this->assertTrue( delete_transient( $key ) );
         }
+
+        function test_transient_data_with_timeout() {
+                $key = rand_str();
+                $value = rand_str();
+                $value2 = rand_str();
+
+                $this->assertTrue( set_transient( $key, $value, 1 ) );
+                sleep( 2 );
+                $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) );
+
+                // Add timeout to existing timeout-less transient.
+                $this->assertTrue( set_transient( $key, $value2, 1 ) );
+                sleep( 2 );
+                $this->assertFalse( get_transient( $key ) );
+        }
 }