From fa1b659d29e5a813bdf272ea037acd8d2e7f6e53 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 6 Jul 2015 14:19:26 +0000
Subject: [PATCH] Merge two `class` attributes in
 `WP_Customize_Media_Control::content_template()` and
 `wp_print_media_templates()`.

props nicholas_io.
fixes #32896.
Built from https://develop.svn.wordpress.org/trunk@33090


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

diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php
index ae7e3f30b0..b1be94f680 100644
--- a/wp-includes/class-wp-customize-control.php
+++ b/wp-includes/class-wp-customize-control.php
@@ -814,7 +814,7 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
 									</video>
 								</div>
 							<# } else { #>
-								<img class="attachment-thumb type-icon" src="{{ data.attachment.icon }}" class="icon" draggable="false" />
+								<img class="attachment-thumb type-icon icon" src="{{ data.attachment.icon }}" draggable="false" />
 								<p class="attachment-title">{{ data.attachment.title }}</p>
 							<# } #>
 						</div>
diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php
index b444310f1f..a8933f36f1 100644
--- a/wp-includes/media-template.php
+++ b/wp-includes/media-template.php
@@ -298,7 +298,7 @@ function wp_print_media_templates() {
 				<# } else if ( 'image' === data.type && data.sizes && data.sizes.full ) { #>
 					<img class="details-image" src="{{ data.sizes.full.url }}" draggable="false" />
 				<# } else if ( -1 === jQuery.inArray( data.type, [ 'audio', 'video' ] ) ) { #>
-					<img class="details-image" src="{{ data.icon }}" class="icon" draggable="false" />
+					<img class="details-image icon" src="{{ data.icon }}" draggable="false" />
 				<# } #>
 
 				<# if ( 'audio' === data.type ) { #>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 458fbc734c..7087bebfa9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta1-33089';
+$wp_version = '4.3-beta1-33090';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.