<!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>[18992] trunk/wp-admin/includes/media.php: Fix media/audio/file URL insertion.</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/18992">18992</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-10-18 19:32:40 +0000 (Tue, 18 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix media/audio/file URL insertion. Strip slashes off title text. Leave red X to images only. fixes <a href="http://core.trac.wordpress.org/ticket/14996">#14996</a>. fixes <a href="http://core.trac.wordpress.org/ticket/17578">#17578</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (18991 => 18992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2011-10-18 19:18:08 UTC (rev 18991)
+++ trunk/wp-admin/includes/media.php 2011-10-18 19:32:40 UTC (rev 18992)
</span><span class="lines">@@ -512,29 +512,29 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($_POST['insertonlybutton']) ) {
</span><del>- $src = $_POST['insertonly']['src'];
</del><ins>+ $src = $_POST['src'];
</ins><span class="cx"> if ( !empty($src) && !strpos($src, '://') )
</span><span class="cx"> $src = "http://$src";
</span><span class="cx">
</span><span class="cx"> if ( isset( $_POST['media_type'] ) && 'image' != $_POST['media_type'] ) {
</span><del>- $title = esc_attr($_POST['insertonly']['title']);
- if ( empty($title) )
- $title = esc_attr( basename($src) );
</del><ins>+ $title = esc_html( stripslashes( $_POST['title'] ) );
+ if ( empty( $title ) )
+ $title = esc_html( basename( $src ) );
</ins><span class="cx">
</span><del>- if ( !empty($title) && !empty($src) )
</del><ins>+ if ( $title && $src )
</ins><span class="cx"> $html = "<a href='" . esc_url($src) . "' >$title</a>";
</span><span class="cx">
</span><span class="cx"> $type = 'file';
</span><del>- if ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) && $ext_type = wp_ext2type( $ext )
</del><ins>+ if ( ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) ) && ( $ext_type = wp_ext2type( $ext ) )
</ins><span class="cx"> && ( 'audio' == $ext_type || 'video' == $ext_type ) )
</span><span class="cx"> $type = $ext_type;
</span><span class="cx">
</span><span class="cx"> $html = apply_filters( $type . '_send_to_editor_url', $html, esc_url_raw( $src ), $title );
</span><span class="cx"> } else {
</span><span class="cx"> $align = '';
</span><del>- $alt = esc_attr($_POST['insertonly']['alt']);
- if ( isset($_POST['insertonly']['align']) ) {
- $align = esc_attr($_POST['insertonly']['align']);
</del><ins>+ $alt = esc_attr( stripslashes( $_POST['alt'] ) );
+ if ( isset($_POST['align']) ) {
+ $align = esc_attr( stripslashes( $_POST['align'] ) );
</ins><span class="cx"> $class = " class='align$align'";
</span><span class="cx"> }
</span><span class="cx"> if ( !empty($src) )
</span><span class="lines">@@ -1517,9 +1517,12 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> getImageData : function() {
</span><ins>+ if ( jQuery('table.describe').hasClass('not-image') )
+ return;
+
</ins><span class="cx"> var t = addExtImage, src = document.forms[0].src.value;
</span><span class="cx">
</span><del>- if ( ! src || jQuery('table.describe').hasClass('not-image') ) {
</del><ins>+ if ( ! src ) {
</ins><span class="cx"> t.resetImageData();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>