From aaa040eee94f7580b07003befb30e6f1ba931556 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Sun, 6 Mar 2016 15:38:28 +0000
Subject: [PATCH] CSS: Rename the handle for `deprecated-media.css` after
 [36341].

The `media` handle is now used for `media.css` thus the stylesheet
for the old media UI needs a different handle name.

See #35229.
Built from https://develop.svn.wordpress.org/trunk@36869


git-svn-id: http://core.svn.wordpress.org/trunk@36836 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/media.php   | 2 +-
 wp-includes/script-loader.php | 8 ++++----
 wp-includes/version.php       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 966860aea9..d9dd1e67cd 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -455,7 +455,7 @@ wp_enqueue_style( 'colors' );
 // Check callback name for 'media'
 if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )
 	|| ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) )
-	wp_enqueue_style( 'media' );
+	wp_enqueue_style( 'deprecated-media' );
 wp_enqueue_style( 'ie' );
 ?>
 <script type="text/javascript">
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index db74f09782..46a4d7b98b 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -774,9 +774,9 @@ function wp_default_styles( &$styles ) {
 	$styles->add( 'thickbox',            '/wp-includes/js/thickbox/thickbox.css', array( 'dashicons' ) );
 
 	// Deprecated CSS
-	$styles->add( 'media',      "/wp-admin/css/deprecated-media$suffix.css" );
-	$styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' );
-	$styles->add( 'jcrop',      "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.12' );
+	$styles->add( 'deprecated-media', "/wp-admin/css/deprecated-media$suffix.css" );
+	$styles->add( 'farbtastic',       '/wp-admin/css/farbtastic.css', array(), '1.3u1' );
+	$styles->add( 'jcrop',            "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.12' );
 	$styles->add( 'colors-fresh', false, array( 'wp-admin', 'buttons' ) ); // Old handle.
 
 	// RTL CSS
@@ -789,7 +789,7 @@ function wp_default_styles( &$styles ) {
 		'buttons', 'admin-bar', 'wp-auth-check', 'editor-buttons', 'media-views', 'wp-pointer',
 		'wp-jquery-ui-dialog',
 		// deprecated
-		'media', 'farbtastic',
+		'deprecated-media', 'farbtastic',
 	);
 
 	foreach ( $rtl_styles as $rtl_style ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a2e4c19275..ec9baa5f24 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-beta2-36868';
+$wp_version = '4.5-beta2-36869';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.