From f7ae81b15d469eae4d95fc7bbe253ee2b0e497cd Mon Sep 17 00:00:00 2001
From: Daryl Koopersmith <dkoopersmith@gmail.com>
Date: Wed, 19 Sep 2012 01:10:17 +0000
Subject: [PATCH] Rename the attachment-thumbnail class in the media modal
 Attachment view to prevent conflicts with wp_get_attachment_image(). see
 #21390.

git-svn-id: http://core.svn.wordpress.org/trunk@21909 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/css/media-views.css | 10 +++++-----
 wp-includes/js/media-models.js  |  4 ++--
 wp-includes/media.php           |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wp-includes/css/media-views.css b/wp-includes/css/media-views.css
index b6d8bf2b72..ec497b1f2a 100644
--- a/wp-includes/css/media-views.css
+++ b/wp-includes/css/media-views.css
@@ -267,7 +267,7 @@
 	background: #21759b;
 }
 
-.attachment-thumbnail {
+.attachment-preview {
 	position: absolute;
 	top: 0;
 	left: 0;
@@ -304,11 +304,11 @@
 .attachment .landscape img {
 	height: 200px;
 }
-.attachment .attachment-thumbnail:hover {
+.attachment .attachment-preview:hover {
 	overflow: visible;
 	z-index: 1000;
 }
-.attachment .attachment-thumbnail:hover img {
+.attachment .attachment-preview:hover img {
 	border: 10px solid #fff;
 	box-shadow: 0 0 10px rgba( 0, 0, 0, 0.4 );
 }*/
@@ -322,7 +322,7 @@
 .attachment .landscape img {
 	height: 200px;
 }
-.attachment .attachment-thumbnail:hover img {
+.attachment .attachment-preview:hover img {
 	height: auto;
 	width: auto;
 	max-height: 200px;
@@ -356,7 +356,7 @@
 	transition:         width 200ms;
 }
 
-.attachment-thumbnail .media-progress-bar {
+.attachment-preview .media-progress-bar {
 	position: absolute;
 	top: 50%;
 	left: 15%;
diff --git a/wp-includes/js/media-models.js b/wp-includes/js/media-models.js
index 73fd11f28e..db103639b0 100644
--- a/wp-includes/js/media-models.js
+++ b/wp-includes/js/media-models.js
@@ -441,8 +441,8 @@ if ( typeof wp === 'undefined' )
 		}
 	}, {
 		defaultProps: {
-			orderby:       'date',
-			order:         'DESC'
+			orderby: 'date',
+			order:   'DESC'
 		},
 
 		defaultArgs: {
diff --git a/wp-includes/media.php b/wp-includes/media.php
index 25dca9e57a..19571da935 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -1645,7 +1645,7 @@ function wp_print_media_templates( $attachment ) {
 	</script>
 
 	<script type="text/html" id="tmpl-attachment">
-		<div class="attachment-thumbnail type-<%- type %> subtype-<%- subtype %> <%- orientation %>">
+		<div class="attachment-preview type-<%- type %> subtype-<%- subtype %> <%- orientation %>">
 			<% if ( thumbnail ) { %>
 				<img src="<%- thumbnail %>" draggable="false" />
 			<% } %>