<!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>[34163] trunk/src: Don't ever use the `guid` value when retrieving URLs for media, use `wp_get_attachment_url()`.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/34163">34163</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/34163","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-15 02:49:12 +0000 (Tue, 15 Sep 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Don't ever use the `guid` value when retrieving URLs for media, use `wp_get_attachment_url()`. Use `get_attached_file()` for path to file.
Fixes <a href="https://core.trac.wordpress.org/ticket/33386">#33386</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminasyncuploadphp">trunk/src/wp-admin/async-upload.php</a></li>
<li><a href="#trunksrcwpadmincustomheaderphp">trunk/src/wp-admin/custom-header.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmedialisttablephp">trunk/src/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpsiteiconphp">trunk/src/wp-admin/includes/class-wp-site-icon.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludespostfunctionsphp">trunk/src/wp-includes/post-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminasyncuploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/async-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/async-upload.php 2015-09-15 02:08:07 UTC (rev 34162)
+++ trunk/src/wp-admin/async-upload.php 2015-09-15 02:49:12 UTC (rev 34163)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) )
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = $post->post_title ? $post->post_title : wp_basename( $post->guid ); // Title shouldn't ever be empty, but use filename just in case.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Title shouldn't ever be empty, but use filename just in case.
+ $file = get_attached_file( $post->ID );
+ $title = $post->post_title ? $post->post_title : wp_basename( $file );
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60, '…' ) ) . '</span></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 2 :
</span></span></pre></div>
<a id="trunksrcwpadmincustomheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/custom-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/custom-header.php 2015-09-15 02:08:07 UTC (rev 34162)
+++ trunk/src/wp-admin/custom-header.php 2015-09-15 02:49:12 UTC (rev 34163)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1116,7 +1116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> final public function create_attachment_object( $cropped, $parent_attachment_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = get_post( $parent_attachment_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_url = $parent->guid;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_url = wp_get_attachment_url( $parent->ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $size = @getimagesize( $cropped );
</span></span></pre></div>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2015-09-15 02:08:07 UTC (rev 34162)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2015-09-15 02:49:12 UTC (rev 34163)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3155,7 +3155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/custom-header.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_url = get_post( $attachment_id )->guid;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_url = wp_get_attachment_url( $attachment_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $size = @getimagesize( $cropped );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmedialisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-media-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-media-list-table.php 2015-09-15 02:08:07 UTC (rev 34162)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2015-09-15 02:49:12 UTC (rev 34163)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,7 +370,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $link_end; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _media_states( $post ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </strong>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="filename"><span class="screen-reader-text"><?php _e( 'File name:' ); ?> </span><?php echo wp_basename( $post->guid ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="filename">
+ <span class="screen-reader-text"><?php _e( 'File name:' ); ?> </span>
+ <?php
+ $file = get_attached_file( $post->ID );
+ echo wp_basename( $file );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpsiteiconphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-site-icon.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-icon.php 2015-09-15 02:08:07 UTC (rev 34162)
+++ trunk/src/wp-admin/includes/class-wp-site-icon.php 2015-09-15 02:49:12 UTC (rev 34163)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function create_attachment_object( $cropped, $parent_attachment_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = get_post( $parent_attachment_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_url = $parent->guid;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_url = wp_get_attachment_url( $parent->ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $size = @getimagesize( $cropped );
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2015-09-15 02:08:07 UTC (rev 34162)
+++ trunk/src/wp-admin/includes/media.php 2015-09-15 02:49:12 UTC (rev 34163)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1368,7 +1368,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $toggle_on = __( 'Show' );
</span><span class="cx" style="display: block; padding: 0 10px"> $toggle_off = __( 'Hide' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filename = esc_html( wp_basename( $post->guid ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file = get_attached_file( $post->ID );
+ $filename = esc_html( wp_basename( $file ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = esc_attr( $post->post_title );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_mime_types = get_post_mime_types();
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2015-09-15 02:08:07 UTC (rev 34162)
+++ trunk/src/wp-includes/media.php 2015-09-15 02:49:12 UTC (rev 34163)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1175,7 +1175,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <img src="{{ data.thumb.src }}"/>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-playlist-caption">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="wp-playlist-item-meta wp-playlist-item-title"><?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="wp-playlist-item-meta wp-playlist-item-title"><?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: playlist item title */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( _x( '“%s”', 'playlist item title' ), '{{ data.title }}' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?></span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2076,7 +2076,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_object($attachment) )
</span><span class="cx" style="display: block; padding: 0 10px"> return array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filename = basename($attachment->guid);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file = get_attached_file( $attachment->ID );
+ $filename = basename( $file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $objects = array('attachment');
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludespostfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post-functions.php 2015-09-15 02:08:07 UTC (rev 34162)
+++ trunk/src/wp-includes/post-functions.php 2015-09-15 02:49:12 UTC (rev 34163)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4648,7 +4648,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $comment_ids as $comment_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_comment( $comment_id, true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_defer_comment_counting( false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $post_id ));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4974,7 +4974,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $mime = (int) $mime;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post = get_post( $mime ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = (int) $post->ID;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $post->guid);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file = get_attached_file( $post_id );
+ $ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $file);
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !empty($ext) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_mimes[] = $ext;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ext_type = wp_ext2type( $ext ) )
</span></span></pre>
</div>
</div>
</body>
</html>