Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/wp-includes/option.php
Original file line number Diff line number Diff line change
Expand Up @@ -1677,6 +1677,7 @@ function delete_expired_transients( $force_db = false ) {
WHERE a.meta_key LIKE %s
AND a.meta_key NOT LIKE %s
AND b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) )
AND b.site_id = a.site_id
AND b.meta_value < %d",
$wpdb->esc_like( '_site_transient_' ) . '%',
$wpdb->esc_like( '_site_transient_timeout_' ) . '%',
Expand Down
61 changes: 61 additions & 0 deletions tests/phpunit/tests/option/siteTransient.php
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,65 @@ 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_expired_transients() does not delete site transients on another network.
*
* @ticket 65969
*
* @group ms-required
*
* @covers ::delete_expired_transients
*/
public function test_delete_expired_transients_does_not_cross_networks() {
global $wpdb;

$other_network_id = self::factory()->network->create();
$key = 'cross_network_test';
$value_key = '_site_transient_' . $key;
$timeout_key = '_site_transient_timeout_' . $key;

// Main network: valid, unexpired transient (1 hour in the future).
add_site_option( $value_key, 'main_network_value' );
add_site_option( $timeout_key, time() + HOUR_IN_SECONDS );

// Other network: same transient name, already expired.
add_network_option( $other_network_id, $value_key, 'other_network_value' );
add_network_option( $other_network_id, $timeout_key, time() - 1 );

delete_expired_transients();

$main_network_rows = $wpdb->get_col(
$wpdb->prepare(
"SELECT meta_key FROM {$wpdb->sitemeta} WHERE site_id = %d AND meta_key IN ( %s, %s )",
get_current_network_id(),
$value_key,
$timeout_key
)
);

$other_network_rows = $wpdb->get_col(
$wpdb->prepare(
"SELECT meta_key FROM {$wpdb->sitemeta} WHERE site_id = %d AND meta_key IN ( %s, %s )",
$other_network_id,
$value_key,
$timeout_key
)
);

$this->assertContains(
$value_key,
$main_network_rows,
'An unexpired site transient on the main network must not be deleted because one of the same name expired on another network.'
);
$this->assertContains(
$timeout_key,
$main_network_rows,
'The timeout row for an unexpired site transient on the main network must remain.'
);
$this->assertEmpty(
$other_network_rows,
'The expired site transient and timeout on the other network should be deleted.'
);
}
}
Loading