Changeset 56448

Timestamp:

08/24/2023 03:55:27 PM (4 months ago)

Author:

joemcgill

Message:

Rewrite Rules: Prevent stampedes when flush_rewrite_rules() is called

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.

File:

• trunk/src/wp-includes/class-wp-rewrite.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-rewrite.php

@@ -1491 +1491 @@
         $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;
-            }
+            $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 );
         }
-
-        return $this->rules;
     }
 
@@ -1865 +1882 @@
         }
 
-        update_option( 'rewrite_rules', '' );
-        $this->wp_rewrite_rules();
+        $this->refresh_rewrite_rules();
 
         /**