<!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>[22847] trunk: In wp.media.editor:send, revert back to the old field names used by media_upload_form_handler() for easier back compat.</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/22847">22847</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-11-26 22:08:50 +0000 (Mon, 26 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>In wp.media.editor:send, revert back to the old field names used by media_upload_form_handler() for easier back compat.
Fix notices in wp_ajax_send_attachment_to_editor().
Props nacin, azaozz, miqrogroove
fixes <a href="http://core.trac.wordpress.org/ticket/22553">#22553</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunkwpincludesjsmediaeditorjs">trunk/wp-includes/js/media-editor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (22846 => 22847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2012-11-26 22:03:37 UTC (rev 22846)
+++ trunk/wp-admin/includes/ajax-actions.php 2012-11-26 22:08:50 UTC (rev 22847)
</span><span class="lines">@@ -1947,22 +1947,22 @@
</span><span class="cx"> wp_update_post( array( 'ID' => $id, 'post_parent' => $insert_into_post_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $html = isset( $attachment['title'] ) ? $attachment['title'] : '';
</del><ins>+ $rel = $url = '';
+ $html = $title = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
</ins><span class="cx"> if ( ! empty( $attachment['url'] ) ) {
</span><del>- $rel = '';
- if ( strpos($attachment['url'], 'attachment_id') || get_attachment_link( $id ) == $attachment['url'] )
</del><ins>+ $url = $attachment['url'];
+ if ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url )
</ins><span class="cx"> $rel = ' rel="attachment wp-att-' . $id . '"';
</span><del>- $html = '<a href="' . esc_url( $attachment['url'] ) . '"' . $rel . '>' . $html . '</a>';
</del><ins>+ $html = '<a href="' . esc_url( $url ) . '"' . $rel . '>' . $html . '</a>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> remove_filter( 'media_send_to_editor', 'image_media_send_to_editor', 10, 3 );
</span><span class="cx">
</span><span class="cx"> if ( 'image' === substr( $post->post_mime_type, 0, 5 ) ) {
</span><del>- $url = $attachment['url'];
- $align = isset( $attachment['image-align'] ) ? $attachment['image-align'] : 'none';
</del><ins>+ $align = isset( $attachment['align'] ) ? $attachment['align'] : 'none';
</ins><span class="cx"> $size = isset( $attachment['image-size'] ) ? $attachment['image-size'] : 'medium';
</span><del>- $alt = isset( $attachment['image-alt'] ) ? $attachment['image-alt'] : '';
- $caption = isset( $attachment['caption'] ) ? $attachment['caption'] : '';
</del><ins>+ $alt = isset( $attachment['image_alt'] ) ? $attachment['image_alt'] : '';
+ $caption = isset( $attachment['post_excerpt'] ) ? $attachment['post_excerpt'] : '';
</ins><span class="cx"> $title = ''; // We no longer insert title tags into <img> tags, as they are redundant.
</span><span class="cx"> $html = get_image_send_to_editor( $id, $caption, $title, $align, $url, (bool) $rel, $size, $alt );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesjsmediaeditorjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-editor.js (22846 => 22847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-editor.js 2012-11-26 22:03:37 UTC (rev 22846)
+++ trunk/wp-includes/js/media-editor.js 2012-11-26 22:08:50 UTC (rev 22847)
</span><span class="lines">@@ -431,12 +431,12 @@
</span><span class="cx">
</span><span class="cx"> if ( 'image' === attachment.type ) {
</span><span class="cx"> html = wp.media.string.image( props );
</span><del>- options['caption'] = caption;
</del><ins>+ options.post_excerpt = caption;
</ins><span class="cx">
</span><span class="cx"> _.each({
</span><del>- align: 'image-align',
</del><ins>+ align: 'align',
</ins><span class="cx"> size: 'image-size',
</span><del>- alt: 'image-alt'
</del><ins>+ alt: 'image_alt'
</ins><span class="cx"> }, function( option, prop ) {
</span><span class="cx"> if ( props[ prop ] )
</span><span class="cx"> options[ option ] = props[ prop ];
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> html = wp.media.string.link( props );
</span><del>- options.title = props.title;
</del><ins>+ options.post_title = props.title;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return media.post( 'send-attachment-to-editor', {
</span></span></pre>
</div>
</div>
</body>
</html>