Ticket #22841: 22841.2.diff

wp-includes/js/media-editor.js

@@ -9 +9 @@
                 // outputting the proper object format based on the
                 // attachment's type.
                 props: function( props, attachment ) {
-                        var link, linkUrl, size, sizes, fallbacks;
+                        var link, linkUrl, size, sizes, fallbacks,
+                                defaultProps = wp.media.view.settings.defaultProps;
 
                         // Final fallbacks run after all processing has been completed.
                         fallbacks = function( props ) {
@@ -29 +30 @@
 
                         if ( 'image' === props.type ) {
                                 props = _.defaults( props || {}, {
-                                        align:   getUserSetting( 'align', 'none' ),
-                                        size:    getUserSetting( 'imgsize', 'medium' ),
+                                        align:   defaultProps.align || getUserSetting( 'align', 'none' ),
+                                        size:    defaultProps.size  || getUserSetting( 'imgsize', 'medium' ),
                                         url:     '',
                                         classes: []
                                 });
@@ -42 +43 @@
 
                         props.title = props.title || attachment.title;
 
-                        link = props.link || getUserSetting( 'urlbutton', 'post' );
+                        link = props.link || defaultProps.link || getUserSetting( 'urlbutton', 'file' );
                         if ( 'file' === link )
                                 linkUrl = attachment.url;
                         else if ( 'post' === link )

wp-includes/js/media-views.js

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

wp-includes/media.php

@@ -1454 +1454 @@
         $tabs = apply_filters( 'media_upload_tabs', $tabs );
         unset( $tabs['type'], $tabs['type_url'], $tabs['gallery'], $tabs['library'] );
 
+        $props = array(
+                'link'  => get_option( 'image_default_link_type' ), // db default is 'file'
+                'align' => get_option( 'image_default_align' ), // empty default
+                'size'  => get_option( 'image_default_size' ),  // empty default
+        );
+
         $settings = array(
                 'tabs'      => $tabs,
                 'tabUrl'    => add_query_arg( array( 'chromeless' => true ), admin_url('media-upload.php') ),
@@ -1465 +1471 @@
                 'post'    => array(
                         'id' => 0,
                 ),
+                'defaultProps' => $props,
         );
 
         $post = null;

wp-includes/media-template.php

@@ -291 +291 @@
                                         <option value="custom">
                                                 <?php esc_attr_e('Custom URL'); ?>
                                         </option>
-                                        <option value="post" selected>
+                                        <option value="file" selected>
+                                                <?php esc_attr_e('Media File'); ?>
+                                        </option>
+                                        <option value="post">
                                                 <?php esc_attr_e('Attachment Page'); ?>
                                         </option>
-                                        <option value="file">
-                                                <?php esc_attr_e('Media File'); ?>
-                                        </option>
                                         <option value="none">
                                                 <?php esc_attr_e('None'); ?>
                                         </option>
@@ -347 +347 @@
                                         data-user-setting="urlbutton"
                                 <# } #>>
 
-                                <option value="post" selected>
+                                <option value="file" selected>
+                                        <?php esc_attr_e('Media File'); ?>
+                                </option>
+                                <option value="post">
                                         <?php esc_attr_e('Attachment Page'); ?>
                                 </option>
-                                <option value="file">
-                                        <?php esc_attr_e('Media File'); ?>
-                                </option>
                         </select>
                 </label>