<!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>[49207] trunk/src: Media: Add 'Uploaded to' for individual media items in the media editor.</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 { white-space: pre-line; 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/49207">49207</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/49207","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>antpb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-10-19 20:27:34 +0000 (Mon, 19 Oct 2020)</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'>Media: Add 'Uploaded to' for individual media items in the media editor.
Adds a link in the media editor showing which post a media item was uploaded to.
Props karmatosed, garrett-eclipse, Mista-Flo, SergeyBiryukov, joemcgill, hellofromTonya.
Fixes <a href="https://core.trac.wordpress.org/ticket/46866">#46866</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsseditcss">trunk/src/wp-admin/css/edit.css</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsseditcss"></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/css/edit.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/edit.css 2020-10-19 20:18:44 UTC (rev 49206)
+++ trunk/src/wp-admin/css/edit.css 2020-10-19 20:27:34 UTC (rev 49207)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,6 +458,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #post-body .misc-pub-post-status:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #post-body #visibility:before,
</span><span class="cx" style="display: block; padding: 0 10px"> .curtime #timestamp:before,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#post-body .misc-pub-uploadedby:before,
+#post-body .misc-pub-uploadedto:before,
</ins><span class="cx" style="display: block; padding: 0 10px"> #post-body .misc-pub-revisions:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #post-body .misc-pub-response-to:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #post-body .misc-pub-comment-status:before {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,6 +469,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #post-body .misc-pub-post-status:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #post-body #visibility:before,
</span><span class="cx" style="display: block; padding: 0 10px"> .curtime #timestamp:before,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#post-body .misc-pub-uploadedby:before,
+#post-body .misc-pub-uploadedto:before,
</ins><span class="cx" style="display: block; padding: 0 10px"> #post-body .misc-pub-revisions:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #post-body .misc-pub-response-to:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #post-body .misc-pub-comment-status:before {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,6 +499,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> top: -1px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#post-body .misc-pub-uploadedby:before {
+ content: "\f110";
+ position: relative;
+ top: -1px;
+}
+
+#post-body .misc-pub-uploadedto:before {
+ content: "\f318";
+ position: relative;
+ top: -1px;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #post-body .misc-pub-revisions:before {
</span><span class="cx" style="display: block; padding: 0 10px"> content: "\f321";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2020-10-19 20:18:44 UTC (rev 49206)
+++ trunk/src/wp-admin/includes/media.php 2020-10-19 20:27:34 UTC (rev 49207)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3288,7 +3288,37 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $att_url = wp_get_attachment_url( $attachment_id );
</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">+ $author = get_userdata( $post->post_author );
+
+ $uploaded_by_name = __( '(no author)' );
+ $uploaded_by_link = '';
+ if ( $author->exists() ) {
+ $uploaded_by_name = $author->display_name ? $author->display_name : $author->nickname;
+ $uploaded_by_link = get_edit_user_link( $author->ID );
+ } ?>
+ <div class="misc-pub-section misc-pub-uploadedby">
+ <?php if ( $uploaded_by_link ) : ?>
+ <?php _e( 'Uploaded by:' ); ?> <a href="<?php echo $uploaded_by_link ?>"><strong><?php echo $uploaded_by_name ?></strong></a>
+ <?php else: ?>
+ <?php _e( 'Uploaded by:' ); ?> <strong><?php echo $uploaded_by_name ?></strong>
+ <?php endif; ?>
+ </div>
+
+ <?php if ( $post->post_parent ) :
+ $post_parent = get_post( $post->post_parent );
+ if ( $post_parent ) :
+ $uploaded_to_title = $post_parent->post_title ? $post_parent->post_title : __( '(no title)' );
+ $uploaded_to_link = get_edit_post_link( $post->post_parent, 'raw' ); ?>
+ <div class="misc-pub-section misc-pub-uploadedto">
+ <?php if ( $uploaded_to_link ) : ?>
+ <?php _e( 'Uploaded to:' ); ?> <a href="<?php echo $uploaded_to_link ?>"><strong><?php echo $uploaded_to_title; ?></strong></a>
+ <?php else: ?>
+ <?php _e( 'Uploaded to:' ); ?> <strong><?php echo $uploaded_to_title; ?></strong>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+ <?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="misc-pub-section misc-pub-attachment">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="attachment_url"><?php _e( 'File URL:' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" class="widefat urlfield" readonly="readonly" name="attachment_url" id="attachment_url" value="<?php echo esc_attr( $att_url ); ?>" />
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></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-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media-template.php 2020-10-19 20:18:44 UTC (rev 49206)
+++ trunk/src/wp-includes/media-template.php 2020-10-19 20:27:34 UTC (rev 49207)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,10 +405,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="details">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="screen-reader-text"><?php _e( 'Details' ); ?></h2>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="uploaded"><strong><?php _e( 'Uploaded on:' ); ?></strong> {{ data.dateFormatted }}</div>
+ <div class="uploaded-by">
+ <strong><?php _e( 'Uploaded by:' ); ?></strong>
+ <# if ( data.authorLink ) { #>
+ <a href="{{ data.authorLink }}">{{ data.authorName }}</a>
+ <# } else { #>
+ {{ data.authorName }}
+ <# } #>
+ </div>
+ <# if ( data.uploadedToTitle ) { #>
+ <div class="uploaded-to">
+ <strong><?php _e( 'Uploaded to:' ); ?></strong>
+ <# if ( data.uploadedToLink ) { #>
+ <a href="{{ data.uploadedToLink }}">{{ data.uploadedToTitle }}</a>
+ <# } else { #>
+ {{ data.uploadedToTitle }}
+ <# } #>
+ </div>
+ <# } #>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="filename"><strong><?php _e( 'File name:' ); ?></strong> {{ data.filename }}</div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="filename"><strong><?php _e( 'File type:' ); ?></strong> {{ data.mime }}</div>
- <div class="uploaded"><strong><?php _e( 'Uploaded on:' ); ?></strong> {{ data.dateFormatted }}</div>
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="file-type"><strong><?php _e( 'File type:' ); ?></strong> {{ data.mime }}</div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="file-size"><strong><?php _e( 'File size:' ); ?></strong> {{ data.filesizeHumanReadable }}</div>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( 'image' === data.type && ! data.uploading ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.width && data.height ) { #>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,20 +502,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="attachment-details-two-column-description" class="name"><?php _e( 'Description' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea id="attachment-details-two-column-description" {{ maybeReadOnly }}>{{ data.description }}</textarea>
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="setting">
- <span class="name"><?php _e( 'Uploaded By' ); ?></span>
- <span class="value">{{ data.authorName }}</span>
- </span>
- <# if ( data.uploadedToTitle ) { #>
- <span class="setting">
- <span class="name"><?php _e( 'Uploaded To' ); ?></span>
- <# if ( data.uploadedToLink ) { #>
- <span class="value"><a href="{{ data.uploadedToLink }}">{{ data.uploadedToTitle }}</a></span>
- <# } else { #>
- <span class="value">{{ data.uploadedToTitle }}</span>
- <# } #>
- </span>
- <# } #>
</del><span class="cx" style="display: block; padding: 0 10px"> <span class="setting" data-setting="url">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="attachment-details-two-column-copy-link" class="name"><?php _e( 'File URL:' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" class="attachment-details-copy-link" id="attachment-details-two-column-copy-link" value="{{ data.url }}" readonly />
</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 2020-10-19 20:18:44 UTC (rev 49206)
+++ trunk/src/wp-includes/media.php 2020-10-19 20:27:34 UTC (rev 49207)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3809,7 +3809,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author = new WP_User( $attachment->post_author );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $author->exists() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response['authorName'] = html_entity_decode( $author->display_name, ENT_QUOTES, get_bloginfo( 'charset' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response['authorName'] = html_entity_decode( $author->display_name ? $author->display_name : $author->nickname, ENT_QUOTES, get_bloginfo( 'charset' ) );
+ $response['authorLink'] = get_edit_user_link( $author->ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $response['authorName'] = __( '(no author)' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3816,19 +3817,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $attachment->post_parent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_parent = get_post( $attachment->post_parent );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- $post_parent = false;
- }
-
- if ( $post_parent ) {
- $parent_type = get_post_type_object( $post_parent->post_type );
-
- if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $attachment->post_parent ) ) {
- $response['uploadedToLink'] = get_edit_post_link( $attachment->post_parent, 'raw' );
- }
-
- if ( $parent_type && current_user_can( 'read_post', $attachment->post_parent ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post_parent ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $response['uploadedToTitle'] = $post_parent->post_title ? $post_parent->post_title : __( '(no title)' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response['uploadedToLink'] = get_edit_post_link( $attachment->post_parent, 'raw' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>