Skip to content

Commit

Permalink
Rewrite Rules: Prevent stampedes when flush_rewrite_rules() is called
Browse files Browse the repository at this point in the history
This ensures that the `rewrite_rules` option is not emptied until the new value has been recalculated and the option is updated. The logic for refreshing the option value is moved to a new private method named `WP_Rewrite::refresh_rewrite_rules` which is used by both the `flush_rules` and `refresh_rewrite_rules` methods.

Props iCaleb, joemcgill, flixos90, mukesh27.
Fixes #58998.


git-svn-id: https://develop.svn.wordpress.org/trunk@56448 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
joemcgill committed Aug 24, 2023
1 parent 40df0ec commit c10caf9
Showing 1 changed file with 25 additions and 9 deletions.
34 changes: 25 additions & 9 deletions src/wp-includes/class-wp-rewrite.php
Original file line number Diff line number Diff line change
Expand Up @@ -1490,18 +1490,35 @@ public function rewrite_rules() {
public function wp_rewrite_rules() {
$this->rules = get_option( 'rewrite_rules' );
if ( empty( $this->rules ) ) {
$this->matches = 'matches';
$this->rewrite_rules();
if ( ! did_action( 'wp_loaded' ) ) {
add_action( 'wp_loaded', array( $this, 'flush_rules' ) );
return $this->rules;
}
update_option( 'rewrite_rules', $this->rules );
$this->refresh_rewrite_rules();
}

return $this->rules;
}

/**
* Refreshes the rewrite rules, saving the fresh value to the database.
* If the `wp_loaded` action has not occurred yet, will postpone saving to the database.
*
* @since 6.4.0
*/
private function refresh_rewrite_rules() {
$this->rules = '';
$this->matches = 'matches';

$this->rewrite_rules();

if ( ! did_action( 'wp_loaded' ) ) {
/*
* Is not safe to save the results right now, as the rules may be partial.
* Need to give all rules the chance to register.
*/
add_action( 'wp_loaded', array( $this, 'flush_rules' ) );
} else {
update_option( 'rewrite_rules', $this->rules );
}
}

/**
* Retrieves mod_rewrite-formatted rewrite rules to write to .htaccess.
*
Expand Down Expand Up @@ -1864,8 +1881,7 @@ public function flush_rules( $hard = true ) {
unset( $do_hard_later );
}

update_option( 'rewrite_rules', '' );
$this->wp_rewrite_rules();
$this->refresh_rewrite_rules();

/**
* Filters whether a "hard" rewrite rule flush should be performed when requested.
Expand Down

0 comments on commit c10caf9

Please sign in to comment.