<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[17120] trunk/wp-admin/includes/media.php:
Ensure that images added using Press This get the correct source url set.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17120">17120</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-12-23 15:41:05 +0000 (Thu, 23 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure that images added using Press This get the correct source url set. Fixes <a href="http://trac.wordpress.org/ticket/15841">#15841</a> props duck_.</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 (17119 => 17120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-12-23 15:26:49 UTC (rev 17119)
+++ trunk/wp-admin/includes/media.php 2010-12-23 15:41:05 UTC (rev 17120)
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> $content = $image_meta['caption'];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $title = @$desc;
</del><ins>+ $title = isset($desc) ? $desc : '';
</ins><span class="cx">
</span><span class="cx"> // Construct the attachment array
</span><span class="cx"> $attachment = array_merge( array(
</span><span class="lines">@@ -547,19 +547,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
</del><ins>+ * Download an image from the specified URL and attach it to a post.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.6.0
</span><span class="cx"> *
</span><del>- * @param unknown_type $file
- * @param unknown_type $post_id
- * @param unknown_type $desc
- * @return unknown
</del><ins>+ * @param string $file The URL of the image to download
+ * @param int $post_id The post ID the media is to be associated with
+ * @param string $desc Optional. Description of the image
+ * @return string|WP_Error Populated HTML img tag on success
</ins><span class="cx"> */
</span><span class="cx"> function media_sideload_image($file, $post_id, $desc = null) {
</span><del>- if (!empty($file) ) {
</del><ins>+ if ( ! empty($file) ) {
</ins><span class="cx"> // Download file to temp location
</span><del>- $tmp = download_url($file);
</del><ins>+ $tmp = download_url( $file );
</ins><span class="cx">
</span><span class="cx"> // Set variables for storage
</span><span class="cx"> // fix file filename for query strings
</span><span class="lines">@@ -574,19 +574,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // do the validation and storage stuff
</span><del>- $id = media_handle_sideload( $file_array, $post_id, @$desc );
- $src = get_attachment_link( $id );
-
</del><ins>+ $id = media_handle_sideload( $file_array, $post_id, $desc );
</ins><span class="cx"> // If error storing permanently, unlink
</span><span class="cx"> if ( is_wp_error($id) ) {
</span><span class="cx"> @unlink($file_array['tmp_name']);
</span><span class="cx"> return $id;
</span><span class="cx"> }
</span><ins>+
+ $src = wp_get_attachment_url( $id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Finally check to make sure the file has been saved, then return the html
</span><del>- if ( !empty($src) ) {
- $alt = @$desc;
</del><ins>+ if ( ! empty($src) ) {
+ $alt = isset($desc) ? esc_attr($desc) : '';
</ins><span class="cx"> $html = "<img src='$src' alt='$alt' />";
</span><span class="cx"> return $html;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>