Ticket #28517: 28517-without-tests.patch

src/wp-includes/rewrite.php

@@ -2043 +2043 @@
          * @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) {
-                delete_option('rewrite_rules');
+                delete_option( 'rewrite_rules' );
                 $this->wp_rewrite_rules();
                 /**
                  * Filter whether a "hard" rewrite rule flush should be performed when requested.
@@ -2054 +2054 @@
                  *
                  * @param bool $hard Whether to flush rewrite rules "hard". Default true.
                  */
-                if ( ! $hard || ! apply_filters( 'flush_rewrite_rules_hard', true ) ) {
+                if ( ! $hard && ! apply_filters( 'flush_rewrite_rules_hard', false ) ) {
                         return;
                 }
-                if ( function_exists( 'save_mod_rewrite_rules' ) )
+                if ( function_exists( 'save_mod_rewrite_rules' ) ) {
                         save_mod_rewrite_rules();
-                if ( function_exists( 'iis7_save_url_rewrite_rules' ) )
+                }
+                if ( function_exists( 'iis7_save_url_rewrite_rules' ) ) {
                         iis7_save_url_rewrite_rules();
+                }
         }
 
         /**