<!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>[55949] trunk/src/wp-admin/includes: Media: Display the {U+201C}Copy URL{U+201D} and {U+201C}Download file{U+201D} row actions when the {U+201C}Unattached{U+201D} filter is applied.</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/55949">55949</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/55949","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-06-20 15:45:23 +0000 (Tue, 20 Jun 2023)</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: Display the {U+201C}Copy URL{U+201D} and {U+201C}Download file{U+201D} row actions when the {U+201C}Unattached{U+201D} filter is applied.
Due to partially duplicated logic for displaying row actions in the Media Library with and without the {U+201C}Unattached{U+201D} filter, the {U+201C}Copy URL{U+201D} and {U+201C}Download file{U+201D} row actions were unintentionally missing with the filter applied.
This commit aims to simplify the logic and bring more consistency to the code.
Includes displaying the {U+201C}Download file{U+201D} row action even when the {U+201C}Trash{U+201D} filter is applied, giving the user one more chance to download the media file before they delete it.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/8901">[8901]</a>, <a href="https://core.trac.wordpress.org/changeset/13100">[13100]</a>, <a href="https://core.trac.wordpress.org/changeset/16227">[16227]</a>, <a href="https://core.trac.wordpress.org/changeset/16229">[16229]</a>, <a href="https://core.trac.wordpress.org/changeset/52842">[52842]</a>, <a href="https://core.trac.wordpress.org/changeset/55198">[55198]</a>, <a href="https://core.trac.wordpress.org/changeset/55221">[55221]</a>.
Props kebbet, costdev, pbiron, oglekler, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/57890">#57890</a>, <a href="https://core.trac.wordpress.org/ticket/57893">#57893</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpmedialisttablephp">trunk/src/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2023-06-20 08:19:51 UTC (rev 55948)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2023-06-20 15:45:23 UTC (rev 55949)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -748,43 +748,58 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private function _get_row_actions( $post, $att_title ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = 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">- if ( $this->detached ) {
- if ( current_user_can( 'edit_post', $post->ID ) ) {
- $actions['edit'] = sprintf(
- '<a href="%s" aria-label="%s">%s</a>',
- get_edit_post_link( $post->ID ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $this->is_trash && current_user_can( 'edit_post', $post->ID ) ) {
+ $actions['edit'] = sprintf(
+ '<a href="%s" aria-label="%s">%s</a>',
+ esc_url( get_edit_post_link( $post->ID ) ),
+ /* translators: %s: Attachment title. */
+ esc_attr( sprintf( __( 'Edit “%s”' ), $att_title ) ),
+ __( 'Edit' )
+ );
+ }
+
+ if ( current_user_can( 'delete_post', $post->ID ) ) {
+ if ( $this->is_trash ) {
+ $actions['untrash'] = sprintf(
+ '<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
+ esc_url( wp_nonce_url( "post.php?action=untrash&post=$post->ID", 'untrash-post_' . $post->ID ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Attachment title. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_attr( sprintf( __( 'Edit “%s”' ), $att_title ) ),
- __( 'Edit' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( sprintf( __( 'Restore “%s” from the Trash' ), $att_title ) ),
+ __( 'Restore' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
+ $actions['trash'] = sprintf(
+ '<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
+ esc_url( wp_nonce_url( "post.php?action=trash&post=$post->ID", 'trash-post_' . $post->ID ) ),
+ /* translators: %s: Attachment title. */
+ esc_attr( sprintf( __( 'Move “%s” to the Trash' ), $att_title ) ),
+ _x( 'Trash', 'verb' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( current_user_can( 'delete_post', $post->ID ) ) {
- if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
- $actions['trash'] = sprintf(
- '<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
- wp_nonce_url( "post.php?action=trash&post=$post->ID", 'trash-post_' . $post->ID ),
- /* translators: %s: Attachment title. */
- esc_attr( sprintf( __( 'Move “%s” to the Trash' ), $att_title ) ),
- _x( 'Trash', 'verb' )
- );
- } else {
- $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
- $actions['delete'] = sprintf(
- '<a href="%s" class="submitdelete aria-button-if-js"%s aria-label="%s">%s</a>',
- wp_nonce_url( "post.php?action=delete&post=$post->ID", 'delete-post_' . $post->ID ),
- $delete_ays,
- /* translators: %s: Attachment title. */
- esc_attr( sprintf( __( 'Delete “%s” permanently' ), $att_title ) ),
- __( 'Delete Permanently' )
- );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH ) {
+ $show_confirmation = ( ! $this->is_trash && ! MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
+
+ $actions['delete'] = sprintf(
+ '<a href="%s" class="submitdelete aria-button-if-js"%s aria-label="%s">%s</a>',
+ esc_url( wp_nonce_url( "post.php?action=delete&post=$post->ID", 'delete-post_' . $post->ID ) ),
+ $show_confirmation,
+ /* translators: %s: Attachment title. */
+ esc_attr( sprintf( __( 'Delete “%s” permanently' ), $att_title ) ),
+ __( 'Delete Permanently' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_permalink( $post->ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_url = wp_get_attachment_url( $post->ID );
+
+ if ( ! $this->is_trash ) {
+ $permalink = get_permalink( $post->ID );
+
+ if ( $permalink ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['view'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s" aria-label="%s" rel="bookmark">%s</a>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_permalink( $post->ID ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_url( $permalink ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Attachment title. */
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( sprintf( __( 'View “%s”' ), $att_title ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'View' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -791,86 +806,32 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( current_user_can( 'edit_post', $post->ID ) ) {
- $actions['attach'] = sprintf(
- '<a href="#the-list" onclick="findPosts.open( \'media[]\', \'%s\' ); return false;" class="hide-if-no-js aria-button-if-js" aria-label="%s">%s</a>',
- $post->ID,
- /* translators: %s: Attachment title. */
- esc_attr( sprintf( __( 'Attach “%s” to existing content' ), $att_title ) ),
- __( 'Attach' )
- );
- }
- } else {
- if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) {
- $actions['edit'] = sprintf(
- '<a href="%s" aria-label="%s">%s</a>',
- get_edit_post_link( $post->ID ),
- /* translators: %s: Attachment title. */
- esc_attr( sprintf( __( 'Edit “%s”' ), $att_title ) ),
- __( 'Edit' )
- );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actions['copy'] = sprintf(
+ '<span class="copy-to-clipboard-container"><button type="button" class="button-link copy-attachment-url media-library" data-clipboard-text="%s" aria-label="%s">%s</button><span class="success hidden" aria-hidden="true">%s</span></span>',
+ esc_url( $attachment_url ),
+ /* translators: %s: Attachment title. */
+ esc_attr( sprintf( __( 'Copy “%s” URL to clipboard' ), $att_title ) ),
+ __( 'Copy URL' ),
+ __( 'Copied!' )
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( current_user_can( 'delete_post', $post->ID ) ) {
- if ( $this->is_trash ) {
- $actions['untrash'] = sprintf(
- '<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
- wp_nonce_url( "post.php?action=untrash&post=$post->ID", 'untrash-post_' . $post->ID ),
- /* translators: %s: Attachment title. */
- esc_attr( sprintf( __( 'Restore “%s” from the Trash' ), $att_title ) ),
- __( 'Restore' )
- );
- } elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
- $actions['trash'] = sprintf(
- '<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
- wp_nonce_url( "post.php?action=trash&post=$post->ID", 'trash-post_' . $post->ID ),
- /* translators: %s: Attachment title. */
- esc_attr( sprintf( __( 'Move “%s” to the Trash' ), $att_title ) ),
- _x( 'Trash', 'verb' )
- );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actions['download'] = sprintf(
+ '<a href="%s" aria-label="%s" download>%s</a>',
+ esc_url( $attachment_url ),
+ /* translators: %s: Attachment title. */
+ esc_attr( sprintf( __( 'Download “%s”' ), $att_title ) ),
+ __( 'Download file' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH ) {
- $delete_ays = ( ! $this->is_trash && ! MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
- $actions['delete'] = sprintf(
- '<a href="%s" class="submitdelete aria-button-if-js"%s aria-label="%s">%s</a>',
- wp_nonce_url( "post.php?action=delete&post=$post->ID", 'delete-post_' . $post->ID ),
- $delete_ays,
- /* translators: %s: Attachment title. */
- esc_attr( sprintf( __( 'Delete “%s” permanently' ), $att_title ) ),
- __( 'Delete Permanently' )
- );
- }
- }
-
- if ( ! $this->is_trash ) {
- if ( get_permalink( $post->ID ) ) {
- $actions['view'] = sprintf(
- '<a href="%s" aria-label="%s" rel="bookmark">%s</a>',
- get_permalink( $post->ID ),
- /* translators: %s: Attachment title. */
- esc_attr( sprintf( __( 'View “%s”' ), $att_title ) ),
- __( 'View' )
- );
- }
-
- $actions['copy'] = sprintf(
- '<span class="copy-to-clipboard-container"><button type="button" class="button-link copy-attachment-url media-library" data-clipboard-text="%s" aria-label="%s">%s</button><span class="success hidden" aria-hidden="true">%s</span></span>',
- esc_url( wp_get_attachment_url( $post->ID ) ),
- /* translators: %s: Attachment title. */
- esc_attr( sprintf( __( 'Copy “%s” URL to clipboard' ), $att_title ) ),
- __( 'Copy URL' ),
- __( 'Copied!' )
- );
-
- $actions['download'] = sprintf(
- '<a href="%s" aria-label="%s" download>%s</a>',
- esc_url( wp_get_attachment_url( $post->ID ) ),
- /* translators: %s: Attachment title. */
- esc_attr( sprintf( __( 'Download “%s”' ), $att_title ) ),
- __( 'Download file' )
- );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->detached && current_user_can( 'edit_post', $post->ID ) ) {
+ $actions['attach'] = sprintf(
+ '<a href="#the-list" onclick="findPosts.open( \'media[]\', \'%s\' ); return false;" class="hide-if-no-js aria-button-if-js" aria-label="%s">%s</a>',
+ $post->ID,
+ /* translators: %s: Attachment title. */
+ esc_attr( sprintf( __( 'Attach “%s” to existing content' ), $att_title ) ),
+ __( 'Attach' )
+ );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -879,7 +840,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $actions An array of action links for each attachment.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Default 'Edit', 'Delete Permanently', 'View'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Includes 'Edit', 'Delete Permanently', 'View',
+ * 'Copy URL' and 'Download file'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post WP_Post object for the current attachment.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $detached Whether the list table contains media not attached
</span><span class="cx" style="display: block; padding: 0 10px"> * to any posts. Default true.
</span></span></pre></div>
<a id="trunksrcwpadminincludesmetaboxesphp"></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/meta-boxes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/meta-boxes.php 2023-06-20 08:19:51 UTC (rev 55948)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2023-06-20 15:45:23 UTC (rev 55949)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -469,10 +469,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'delete_post', $post->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Move to Trash' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ '<a class="submitdelete deletion" href="%1$s">%2$s</a>',
+ get_delete_post_link( $post->ID ),
+ __( 'Move to Trash' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
- echo "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, '', true ) . "'>" . __( 'Delete permanently' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $show_confirmation = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
+
+ printf(
+ '<a class="submitdelete deletion"%1$s href="%2$s">%3$s</a>',
+ $show_confirmation,
+ get_delete_post_link( $post->ID, '', true ),
+ __( 'Delete permanently' )
+ );
</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>