From d63ae29fac84fc66a1c0be0cc4c335844c7d61a1 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascal.birchler@gmail.com>
Date: Sun, 10 Jan 2016 19:07:26 +0000
Subject: [PATCH] After [36254], commit all the necessary files and not just
 the unit test. Built from https://develop.svn.wordpress.org/trunk@36255

git-svn-id: http://core.svn.wordpress.org/trunk@36222 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/schema.php     | 1 +
 wp-includes/class-wp-rewrite.php | 2 +-
 wp-includes/version.php          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index 95da444776..38df908d84 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -427,6 +427,7 @@ function populate_options() {
 	'comment_moderation' => 0,
 	'moderation_notify' => 1,
 	'permalink_structure' => '',
+	'rewrite_rules' => '',
 	'hack_file' => 0,
 	'blog_charset' => 'UTF-8',
 	'moderation_keys' => '',
diff --git a/wp-includes/class-wp-rewrite.php b/wp-includes/class-wp-rewrite.php
index 1107aa9d37..7c639990d1 100644
--- a/wp-includes/class-wp-rewrite.php
+++ b/wp-includes/class-wp-rewrite.php
@@ -1806,7 +1806,7 @@ class WP_Rewrite {
 			unset( $do_hard_later );
 		}
 
-		delete_option('rewrite_rules');
+		update_option( 'rewrite_rules', '' );
 		$this->wp_rewrite_rules();
 
 		/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index db8fa4f014..7e40478af1 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36254';
+$wp_version = '4.5-alpha-36255';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.