Changeset 29283

Timestamp:

07/24/2014 07:34:53 PM (10 years ago)

Author:

wonderboymusic

Message:

The Underscore templates for Gallery settings should respect defaults when marking an <option> as selected.

See #28693.

File:

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

trunk/src/wp-includes/media-template.php

@@ -679 +679 @@
                 <# } #>>
 
-                <option value="post" selected>
+                <option value="post" <# if ( ! wp.media.galleryDefaults.link || 'post' == wp.media.galleryDefaults.link ) {
+                    #>selected="selected"<# }
+                #>>
                     <?php esc_attr_e('Attachment Page'); ?>
                 </option>
-                <option value="file">
+                <option value="file" <# if ( 'file' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
                     <?php esc_attr_e('Media File'); ?>
                 </option>
-                <option value="none">
+                <option value="none" <# if ( 'none' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
                     <?php esc_attr_e('None'); ?>
                 </option>
@@ -696 +698 @@
                 data-setting="columns">
                 <?php for ( $i = 1; $i <= 9; $i++ ) : ?>
-                    <option value="<?php echo esc_attr( $i ); ?>" <?php selected( $i, 3 ); ?>>
+                    <option value="<?php echo esc_attr( $i ); ?>" <#
+                        if ( <?php echo $i ?> == wp.media.galleryDefaults.columns ) { #>selected="selected"<# }
+                    #>>
                         <?php echo esc_html( $i ); ?>
                     </option>