Ticket #23881: 23881.3.diff

src/wp-includes/option.php

@@ -451 +451 @@
                         $alloptions = wp_load_alloptions();
                         if ( !isset( $alloptions[$transient_option] ) ) {
                                 $transient_timeout = '_transient_timeout_' . $transient;
-                                if ( get_option( $transient_timeout ) < time() ) {
+                                $transient_timeout_value = get_option( $transient_timeout );
+                                if ( false !== $transient_timeout_value && $transient_timeout_value < time() ) {
                                         delete_option( $transient_option  );
                                         delete_option( $transient_timeout );
                                         $value = false;

tests/phpunit/tests/option/transient.php

@@ -33 +33 @@
                 $this->assertEquals( $value, get_transient( $key ) );
                 $this->assertTrue( delete_transient( $key ) );
         }
+
+        /**
+         * According to ticket 23881, requesting a transient beginning with "timeout_" and appending
+         * a valid transient key would inadvertently delete the timeout for the original transient.
+         * This test recreates that workflow (as to verify that the bug has been patched).
+         *
+         * @ticket 23881
+         */
+        function test_timeout_safe_delete() {
+                $key = 'test';
+                $value = '1234';
+
+                $this->assertTrue( set_transient( $key, $value, 60 * 60 ) );
+                get_transient( "timeout_{$key}" );
+
+                // Verify our assertion
+                $this->assertEquals( $value, get_transient( $key ) );
+        }
 }