Ticket #11384: 11384.diff

wp-includes/rewrite.php

@@ -1606 +1606 @@
          * @since 1.5.0
          * @access public
          *
+         * @param boolean $refresh whether to force a refresh or not (used by flush_rules())
          * @return array Rewrite rules.
          */
-        function wp_rewrite_rules() {
-                $this->rules = get_option('rewrite_rules');
+        function wp_rewrite_rules($refresh = false) {
+                $this->rules = $refresh ? false : get_option('rewrite_rules');
                 if ( empty($this->rules) ) {
                         $this->matches = 'matches';
                         $this->rewrite_rules();
@@ -1845 +1846 @@
          * @param $hard bool Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard).
          */
         function flush_rules($hard = true) {
-                delete_option('rewrite_rules');
-                $this->wp_rewrite_rules();
+                if ( $hard )
+                        delete_option('rewrite_rules');
+                $this->wp_rewrite_rules(true);
                 if ( $hard && function_exists('save_mod_rewrite_rules') )
                         save_mod_rewrite_rules();
                 if ( $hard && function_exists('iis7_save_url_rewrite_rules') )