Fix orphaned transient timeout cleanup

Author: EVOLVE-DEV-TEAM

src/wp-includes/option.php

@@ -1397,9 +1397,7 @@ function delete_transient( $transient ) {
 		$option         = '_transient_' . $transient;
 		$result         = delete_option( $option );
 
-		if ( $result ) {
-			delete_option( $option_timeout );
-		}
+		delete_option( $option_timeout );
 	}
 
 	if ( $result ) {
@@ -2528,9 +2526,7 @@ function delete_site_transient( $transient ) {
 		$option         = '_site_transient_' . $transient;
 		$result         = delete_site_option( $option );
 
-		if ( $result ) {
-			delete_site_option( $option_timeout );
-		}
+		delete_site_option( $option_timeout );
 	}
 
 	if ( $result ) {

tests/phpunit/tests/option/siteTransient.php

@@ -155,4 +155,26 @@ public function test_site_transients_not_stored_in_options_table_on_ms() {
 
 		$this->assertNull( $option, 'Querying option table should not return transient on multisite.' );
 	}
+
+	/**
+	 * Tests that delete_site_transient() removes an orphaned timeout row.
+	 *
+	 * @ticket 65863
+	 */
+	public function test_delete_site_transient_removes_orphaned_timeout() {
+		$key = 'orphaned_timeout';
+
+		set_site_transient( $key, 'value', 3600 );
+
+		// Remove the value row, leaving only the timeout row.
+		delete_site_option( '_site_transient_' . $key );
+
+		$this->assertFalse( get_site_option( '_site_transient_' . $key ) );
+		$this->assertNotFalse( get_site_option( '_site_transient_timeout_' . $key ) );
+
+		delete_site_transient( $key );
+
+		$this->assertFalse( get_site_option( '_site_transient_' . $key ) );
+		$this->assertFalse( get_site_option( '_site_transient_timeout_' . $key ) );
+	}
 }

tests/phpunit/tests/option/transient.php

@@ -265,4 +265,26 @@ public function test_nonexistent_key_old_timeout() {
 		);
 		$this->assertSame( $expected, $a->get_events() );
 	}
+
+	/**
+	 * Tests that delete_transient() removes an orphaned timeout row.
+	 *
+	 * @ticket 65863
+	 */
+	public function test_delete_transient_removes_orphaned_timeout() {
+		$key = 'orphaned_timeout';
+
+		set_transient( $key, 'value', 3600 );
+
+		// Remove the value row, leaving only the timeout row.
+		delete_option( '_transient_' . $key );
+
+		$this->assertFalse( get_option( '_transient_' . $key ) );
+		$this->assertNotFalse( get_option( '_transient_timeout_' . $key ) );
+
+		delete_transient( $key );
+
+		$this->assertFalse( get_option( '_transient_' . $key ) );
+		$this->assertFalse( get_option( '_transient_timeout_' . $key ) );
+	}
 }