Ticket #31467: 31467-2.patch

src/wp-includes/media-template.php

@@ -641 +641 @@
                                         <# if ( data.userSettings && ! data.model.canEmbed ) { #>
                                                 data-user-setting="urlbutton"
                                         <# } #>>
-
+                                <# if ( 'image' === data.type ) { #>
+                                        <option value="none" selected>
+                                                <?php esc_attr_e('None'); ?>
+                                        </option>
+                                <# } #>
                                 <# if ( data.model.canEmbed ) { #>
                                         <option value="embed" selected>
                                                 <?php esc_attr_e('Embed Media Player'); ?>
                                         </option>
                                         <option value="file">
                                 <# } else { #>
-                                        <option value="file" selected>
+                                        <option value="file">
                                 <# } #>
                                         <# if ( data.model.canEmbed ) { #>
                                                 <?php esc_attr_e('Link to Media File'); ?>
@@ -667 +671 @@
                                         <option value="custom">
                                                 <?php esc_attr_e('Custom URL'); ?>
                                         </option>
-                                        <option value="none">
-                                                <?php esc_attr_e('None'); ?>
-                                        </option>
                                 <# } #>
                                 </select>
                         </label>