Ticket #29107: 29107.2.diff

src/wp-admin/includes/schema.php

@@ -427 +427 @@
         'comment_moderation' => 0,
         'moderation_notify' => 1,
         'permalink_structure' => '',
+        'rewrite_rules' => '',
         'hack_file' => 0,
         'blog_charset' => 'UTF-8',
         'moderation_keys' => '',

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

@@ -1772 +1772 @@
                         unset( $do_hard_later );
                 }
 
-                delete_option('rewrite_rules');
+                update_option( 'rewrite_rules', '' );
                 $this->wp_rewrite_rules();
 
                 /**

tests/phpunit/tests/rewrite.php

@@ -320 +320 @@
                 $this->set_permalink_structure();
         }
 
+        /**
+         * @ticket 29107
+         */
+        public function test_flush_rules_does_not_delete_option() {
+                $this->set_permalink_structure();
+
+                $rewrite_rules = get_option( 'rewrite_rules' );
+                $this->assertSame( '', $rewrite_rules );
+
+                $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+
+                $rewrite_rules = get_option( 'rewrite_rules' );
+                $this->assertInternalType( 'array', $rewrite_rules );
+                $this->assertNotEmpty( $rewrite_rules );
+        }
 }