Changeset 31964 for trunk/src/wp-includes/rewrite.php

Timestamp:

04/01/2015 07:05:21 PM (10 years ago)

Author:

SergeyBiryukov

Message:

When shifting WP_Rewrite::flush_rules() to a later action if it was called too early, make sure to do a hard flush if requested.

props Denis-de-Bernardy, mordauk for initial patch.
fixes #30501.

File:

• trunk/src/wp-includes/rewrite.php (modified) (1 diff)

trunk/src/wp-includes/rewrite.php

@@ -2045 +2045 @@
      * @param bool $hard Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard).
      */
-    public function flush_rules($hard = true) {
+    public function flush_rules( $hard = true ) {
+        static $do_hard_later;
+
         // Prevent this action from running before everyone has registered their rewrites
         if ( ! did_action( 'wp_loaded' ) ) {
             add_action( 'wp_loaded', array( $this, 'flush_rules' ) );
+            $do_hard_later = ( isset( $do_hard_later ) ) ? $do_hard_later || $hard : $hard;
             return;
+        }
+
+        if ( isset( $do_hard_later ) ) {
+            $hard = $do_hard_later;
+            unset( $do_hard_later );
         }