From 7ef42ed78125622e6f460cbad470ecdc689e4906 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 4 Mar 2016 07:56:27 +0000
Subject: [PATCH] Comment out some CSS files in `$_old_files` that were added
 back as a result of [36341].

Add a unit test to make sure the `$_old_files` array does not contain any current project files.

Props joemcgill, swissspidy.
Fixes #36083.
Built from https://develop.svn.wordpress.org/trunk@36843


git-svn-id: http://core.svn.wordpress.org/trunk@36810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/update-core.php | 7 ++++---
 wp-includes/version.php           | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index ed9b5efad9..f990e0984b 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -598,9 +598,10 @@ $_old_files = array(
 'wp-admin/css/colors.min.css',
 'wp-admin/css/colors-rtl.css',
 'wp-admin/css/colors-rtl.min.css',
-'wp-admin/css/media-rtl.min.css',
-'wp-admin/css/media.min.css',
-'wp-admin/css/farbtastic-rtl.min.css',
+// Following files added back in 4.5 see #36083
+// 'wp-admin/css/media-rtl.min.css',
+// 'wp-admin/css/media.min.css',
+// 'wp-admin/css/farbtastic-rtl.min.css',
 'wp-admin/images/lock-2x.png',
 'wp-admin/images/lock.png',
 'wp-admin/js/theme-preview.js',
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f9dc981640..d3e3a48d69 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-beta2-36842';
+$wp_version = '4.5-beta2-36843';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.