<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[23273] branches/3.5/wp-includes: Media: Restore 3.4 behavior by consulting the old-school DB options for default align, size, and link properties.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23273">23273</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-01-04 20:08:45 +0000 (Fri, 04 Jan 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Restore 3.4 behavior by consulting the old-school DB options for default align, size, and link properties.
This restores linking to media files as the default, over attachment pages. This 'default' cannot currently be changed by a user setting (per 3.4 behavior), due to the default database schema.
Merges <a href="http://core.trac.wordpress.org/changeset/23262">[23262]</a> to the 3.5 branch.
fixes <a href="http://core.trac.wordpress.org/ticket/22841">#22841</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches35wpincludesjsmediaeditorjs">branches/3.5/wp-includes/js/media-editor.js</a></li>
<li><a href="#branches35wpincludesjsmediaviewsjs">branches/3.5/wp-includes/js/media-views.js</a></li>
<li><a href="#branches35wpincludesmediatemplatephp">branches/3.5/wp-includes/media-template.php</a></li>
<li><a href="#branches35wpincludesmediaphp">branches/3.5/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches35wpincludesjsmediaeditorjs"></a>
<div class="modfile"><h4>Modified: branches/3.5/wp-includes/js/media-editor.js (23272 => 23273)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.5/wp-includes/js/media-editor.js 2013-01-04 20:07:42 UTC (rev 23272)
+++ branches/3.5/wp-includes/js/media-editor.js 2013-01-04 20:08:45 UTC (rev 23273)
</span><span class="lines">@@ -9,7 +9,8 @@
</span><span class="cx"> // outputting the proper object format based on the
</span><span class="cx"> // attachment's type.
</span><span class="cx"> props: function( props, attachment ) {
</span><del>- var link, linkUrl, size, sizes, fallbacks;
</del><ins>+ var link, linkUrl, size, sizes, fallbacks,
+ defaultProps = wp.media.view.settings.defaultProps;
</ins><span class="cx">
</span><span class="cx"> // Final fallbacks run after all processing has been completed.
</span><span class="cx"> fallbacks = function( props ) {
</span><span class="lines">@@ -29,8 +30,8 @@
</span><span class="cx">
</span><span class="cx"> if ( 'image' === props.type ) {
</span><span class="cx"> props = _.defaults( props || {}, {
</span><del>- align: getUserSetting( 'align', 'none' ),
- size: getUserSetting( 'imgsize', 'medium' ),
</del><ins>+ align: defaultProps.align || getUserSetting( 'align', 'none' ),
+ size: defaultProps.size || getUserSetting( 'imgsize', 'medium' ),
</ins><span class="cx"> url: '',
</span><span class="cx"> classes: []
</span><span class="cx"> });
</span><span class="lines">@@ -42,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> props.title = props.title || attachment.title;
</span><span class="cx">
</span><del>- link = props.link || getUserSetting( 'urlbutton', 'post' );
</del><ins>+ link = props.link || defaultProps.link || getUserSetting( 'urlbutton', 'file' );
</ins><span class="cx"> if ( 'file' === link )
</span><span class="cx"> linkUrl = attachment.url;
</span><span class="cx"> else if ( 'post' === link )
</span></span></pre></div>
<a id="branches35wpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: branches/3.5/wp-includes/js/media-views.js (23272 => 23273)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.5/wp-includes/js/media-views.js 2013-01-04 20:07:42 UTC (rev 23272)
+++ branches/3.5/wp-includes/js/media-views.js 2013-01-04 20:08:45 UTC (rev 23273)
</span><span class="lines">@@ -438,11 +438,12 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> resetDisplays: function() {
</span><ins>+ var defaultProps = media.view.settings.defaultProps;
</ins><span class="cx"> this._displays = [];
</span><span class="cx"> this._defaultDisplaySettings = {
</span><del>- align: getUserSetting( 'align', 'none' ),
- size: getUserSetting( 'imgsize', 'medium' ),
- link: getUserSetting( 'urlbutton', 'post' )
</del><ins>+ align: defaultProps.align || getUserSetting( 'align', 'none' ),
+ size: defaultProps.size || getUserSetting( 'imgsize', 'medium' ),
+ link: defaultProps.link || getUserSetting( 'urlbutton', 'file' )
</ins><span class="cx"> };
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="branches35wpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: branches/3.5/wp-includes/media-template.php (23272 => 23273)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.5/wp-includes/media-template.php 2013-01-04 20:07:42 UTC (rev 23272)
+++ branches/3.5/wp-includes/media-template.php 2013-01-04 20:08:45 UTC (rev 23273)
</span><span class="lines">@@ -291,12 +291,12 @@
</span><span class="cx"> <option value="custom">
</span><span class="cx"> <?php esc_attr_e('Custom URL'); ?>
</span><span class="cx"> </option>
</span><del>- <option value="post" selected>
</del><ins>+ <option value="file" selected>
+ <?php esc_attr_e('Media File'); ?>
+ </option>
+ <option value="post">
</ins><span class="cx"> <?php esc_attr_e('Attachment Page'); ?>
</span><span class="cx"> </option>
</span><del>- <option value="file">
- <?php esc_attr_e('Media File'); ?>
- </option>
</del><span class="cx"> <option value="none">
</span><span class="cx"> <?php esc_attr_e('None'); ?>
</span><span class="cx"> </option>
</span><span class="lines">@@ -347,12 +347,12 @@
</span><span class="cx"> data-user-setting="urlbutton"
</span><span class="cx"> <# } #>>
</span><span class="cx">
</span><del>- <option value="post" selected>
</del><ins>+ <option value="file" selected>
+ <?php esc_attr_e('Media File'); ?>
+ </option>
+ <option value="post">
</ins><span class="cx"> <?php esc_attr_e('Attachment Page'); ?>
</span><span class="cx"> </option>
</span><del>- <option value="file">
- <?php esc_attr_e('Media File'); ?>
- </option>
</del><span class="cx"> </select>
</span><span class="cx"> </label>
</span><span class="cx">
</span></span></pre></div>
<a id="branches35wpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: branches/3.5/wp-includes/media.php (23272 => 23273)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.5/wp-includes/media.php 2013-01-04 20:07:42 UTC (rev 23272)
+++ branches/3.5/wp-includes/media.php 2013-01-04 20:08:45 UTC (rev 23273)
</span><span class="lines">@@ -1454,6 +1454,12 @@
</span><span class="cx"> $tabs = apply_filters( 'media_upload_tabs', $tabs );
</span><span class="cx"> unset( $tabs['type'], $tabs['type_url'], $tabs['gallery'], $tabs['library'] );
</span><span class="cx">
</span><ins>+ $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
+ );
+
</ins><span class="cx"> $settings = array(
</span><span class="cx"> 'tabs' => $tabs,
</span><span class="cx"> 'tabUrl' => add_query_arg( array( 'chromeless' => true ), admin_url('media-upload.php') ),
</span><span class="lines">@@ -1465,6 +1471,7 @@
</span><span class="cx"> 'post' => array(
</span><span class="cx"> 'id' => 0,
</span><span class="cx"> ),
</span><ins>+ 'defaultProps' => $props,
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $post = null;
</span></span></pre>
</div>
</div>
</body>
</html>