mirror of
https://github.com/WordPress/WordPress.git
synced 2025-03-09 07:00:01 +00:00
Media: Display the “Copy URL” and “Download file” row actions when the “Unattached” filter is applied.
Due to partially duplicated logic for displaying row actions in the Media Library with and without the “Unattached” filter, the “Copy URL” and “Download file” 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 “Download file” row action even when the “Trash” filter is applied, giving the user one more chance to download the media file before they delete it. Follow-up to [8901], [13100], [16227], [16229], [52842], [55198], [55221]. Props kebbet, costdev, pbiron, oglekler, SergeyBiryukov. Fixes #57890, #57893. Built from https://develop.svn.wordpress.org/trunk@55949 git-svn-id: http://core.svn.wordpress.org/trunk@55461 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov
parent
5f5719bca8
commit
b1fed29f55
@ -748,129 +748,90 @@ class WP_Media_List_Table extends WP_List_Table {
|
||||
private function _get_row_actions( $post, $att_title ) {
|
||||
$actions = array();
|
||||
|
||||
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 ),
|
||||
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 ) ),
|
||||
/* translators: %s: Attachment title. */
|
||||
esc_attr( sprintf( __( 'Edit “%s”' ), $att_title ) ),
|
||||
__( 'Edit' )
|
||||
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>',
|
||||
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' )
|
||||
);
|
||||
}
|
||||
|
||||
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' )
|
||||
);
|
||||
}
|
||||
}
|
||||
if ( $this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH ) {
|
||||
$show_confirmation = ( ! $this->is_trash && ! MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
|
||||
|
||||
if ( get_permalink( $post->ID ) ) {
|
||||
$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' )
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
$attachment_url = wp_get_attachment_url( $post->ID );
|
||||
|
||||
if ( ! $this->is_trash ) {
|
||||
$permalink = get_permalink( $post->ID );
|
||||
|
||||
if ( $permalink ) {
|
||||
$actions['view'] = sprintf(
|
||||
'<a href="%s" aria-label="%s" rel="bookmark">%s</a>',
|
||||
get_permalink( $post->ID ),
|
||||
esc_url( $permalink ),
|
||||
/* translators: %s: Attachment title. */
|
||||
esc_attr( sprintf( __( 'View “%s”' ), $att_title ) ),
|
||||
__( 'View' )
|
||||
);
|
||||
}
|
||||
|
||||
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' )
|
||||
);
|
||||
}
|
||||
$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!' )
|
||||
);
|
||||
}
|
||||
|
||||
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' )
|
||||
);
|
||||
}
|
||||
$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' )
|
||||
);
|
||||
|
||||
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' )
|
||||
);
|
||||
}
|
||||
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' )
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -879,7 +840,8 @@ class WP_Media_List_Table extends WP_List_Table {
|
||||
* @since 2.8.0
|
||||
*
|
||||
* @param string[] $actions An array of action links for each attachment.
|
||||
* Default 'Edit', 'Delete Permanently', 'View'.
|
||||
* Includes 'Edit', 'Delete Permanently', 'View',
|
||||
* 'Copy URL' and 'Download file'.
|
||||
* @param WP_Post $post WP_Post object for the current attachment.
|
||||
* @param bool $detached Whether the list table contains media not attached
|
||||
* to any posts. Default true.
|
||||
|
||||
@ -469,10 +469,20 @@ function attachment_submit_meta_box( $post ) {
|
||||
<?php
|
||||
if ( current_user_can( 'delete_post', $post->ID ) ) {
|
||||
if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
|
||||
echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Move to Trash' ) . '</a>';
|
||||
printf(
|
||||
'<a class="submitdelete deletion" href="%1$s">%2$s</a>',
|
||||
get_delete_post_link( $post->ID ),
|
||||
__( 'Move to Trash' )
|
||||
);
|
||||
} else {
|
||||
$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>';
|
||||
$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' )
|
||||
);
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '6.3-alpha-55948';
|
||||
$wp_version = '6.3-alpha-55949';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user