From 65e35e3d762fed9839a235051ec4505e47e61964 Mon Sep 17 00:00:00 2001
From: Daryl Koopersmith <dkoopersmith@gmail.com>
Date: Tue, 13 Nov 2012 01:23:18 +0000
Subject: [PATCH] Media: Improve backwards compatibility for
 image_size_names_choose filter. see #22186, #21390.

git-svn-id: http://core.svn.wordpress.org/trunk@22556 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/media.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/wp-includes/media.php b/wp-includes/media.php
index 3fe014dff2..2c249120b0 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -1587,19 +1587,25 @@ function wp_print_media_templates( $attachment ) {
 						'thumbnail' => __('Thumbnail'),
 						'medium'    => __('Medium'),
 						'large'     => __('Large'),
+						'full'      => __('Full Size'),
 					) );
 
-					foreach ( $sizes as $value => $name ) : ?>
+					foreach ( $sizes as $value => $name ) :
+						if ( 'full' === $name )
+							continue;
+						?>
 						<# if ( sizes['<?php echo esc_js( $value ); ?>'] ) { #>
 							<option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, 'medium' ); ?>>
 								<?php echo esc_html( $name ); ?>
 							</option>
 						<# } #>>
-					<?php endforeach; ?>
+					<?php endforeach;
 
-					<option value="full">
-						<?php echo esc_html_e( 'Full Size' ); ?>
-					</option>
+					if ( ! empty( $sizes['full'] ) ) : ?>
+						<option value="full">
+							<?php echo esc_html( $sizes['full'] ); ?>
+						</option>
+					<?php endif; ?>
 				</select>
 			</label>
 		<# } #>