Ticket #31467: 31467.diff

src/wp-admin/includes/schema.php

@@ -467 +467 @@
         // 2.7
         'large_size_w' => 1024,
         'large_size_h' => 1024,
-        'image_default_link_type' => 'file',
+        'image_default_link_type' => 'none',
         'image_default_size' => '',
         'image_default_align' => '',
         'close_comments_for_old_posts' => 0,

src/wp-includes/js/media/controllers/library.js

@@ -139 +139 @@
                 var defaultProps = wp.media.view.settings.defaultProps;
                 this._displays = [];
                 this._defaultDisplaySettings = {
-                        align: defaultProps.align || getUserSetting( 'align', 'none' ),
-                        size:  defaultProps.size  || getUserSetting( 'imgsize', 'medium' ),
-                        link:  defaultProps.link  || getUserSetting( 'urlbutton', 'file' )
+                        align: getUserSetting( 'align', 'none' ) || defaultProps.align,
+                        size:  getUserSetting( 'imgsize', 'medium' ) || defaultProps.size,
+                        link:  getUserSetting( 'urlbutton', 'none' ) || defaultProps.link
                 };
         },
 

src/wp-includes/js/media-views.js

@@ -1182 +1182 @@
                 var defaultProps = wp.media.view.settings.defaultProps;
                 this._displays = [];
                 this._defaultDisplaySettings = {
-                        align: defaultProps.align || getUserSetting( 'align', 'none' ),
-                        size:  defaultProps.size  || getUserSetting( 'imgsize', 'medium' ),
-                        link:  defaultProps.link  || getUserSetting( 'urlbutton', 'file' )
+                        align: getUserSetting( 'align', 'none' ) || defaultProps.align,
+                        size:  getUserSetting( 'imgsize', 'medium' ) || defaultProps.size,
+                        link:  getUserSetting( 'urlbutton', 'none' ) || defaultProps.link
                 };
         },
 

src/wp-includes/media-template.php

@@ -652 +652 @@
                                         </option>
                                         <option value="file">
                                 <# } else { #>
-                                        <option value="file" selected>
+                                        <option value="none" selected>
+                                                <?php esc_attr_e('None'); ?>
+                                        </option>
+                                        <option value="file">
                                 <# } #>
                                         <# if ( data.model.canEmbed ) { #>
                                                 <?php esc_attr_e('Link to Media File'); ?>
@@ -671 +674 @@
                                         <option value="custom">
                                                 <?php esc_attr_e('Custom URL'); ?>
                                         </option>
-                                        <option value="none">
-                                                <?php esc_attr_e('None'); ?>
-                                        </option>
                                 <# } #>
                                 </select>
                         </label>