Changeset 22556

Timestamp:

11/13/2012 01:23:18 AM (12 years ago)

Author:

koopersmith

Message:

Media: Improve backwards compatibility for image_size_names_choose filter. see #22186, #21390.

File:

• trunk/wp-includes/media.php (modified) (2 diffs)

trunk/wp-includes/media.php

@@ -1588 +1588 @@
                         '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' ); ?>>
@@ -1596 +1600 @@
                             </option>
                         <# } #>>
-                    <?php endforeach; ?>
-
-                    <option value="full">
-                        <?php echo esc_html_e( 'Full Size' ); ?>
-                    </option>
+                    <?php endforeach;
+
+                    if ( ! empty( $sizes['full'] ) ) : ?>
+                        <option value="full">
+                            <?php echo esc_html( $sizes['full'] ); ?>
+                        </option>
+                    <?php endif; ?>
                 </select>
             </label>