--- a/wp/wp-admin/includes/class-wp-media-list-table.php Thu Sep 29 08:06:27 2022 +0200
+++ b/wp/wp-admin/includes/class-wp-media-list-table.php Fri Sep 05 18:40:08 2025 +0200
@@ -11,7 +11,6 @@
* Core class used to implement displaying media items in a list table.
*
* @since 3.1.0
- * @access private
*
* @see WP_List_Table
*/
@@ -111,6 +110,10 @@
'per_page' => $wp_query->query_vars['posts_per_page'],
)
);
+ if ( $wp_query->posts ) {
+ update_post_thumbnail_cache( $wp_query );
+ update_post_parent_caches( $wp_query->posts );
+ }
}
/**
@@ -137,7 +140,7 @@
}
$selected = selected(
- $filter && 0 === strpos( $filter, 'post_mime_type:' ) &&
+ $filter && str_starts_with( $filter, 'post_mime_type:' ) &&
wp_match_mime_types( $mime_type, str_replace( 'post_mime_type:', '', $filter ) ),
true,
false
@@ -260,7 +263,7 @@
}
/**
- * Override parent views so we can use the filter bar display.
+ * Overrides parent views to use the filter bar display.
*
* @global string $mode List table view mode.
*/
@@ -275,7 +278,12 @@
<div class="filter-items">
<?php $this->view_switcher( $mode ); ?>
- <label for="attachment-filter" class="screen-reader-text"><?php _e( 'Filter by type' ); ?></label>
+ <label for="attachment-filter" class="screen-reader-text">
+ <?php
+ /* translators: Hidden accessibility text. */
+ _e( 'Filter by type' );
+ ?>
+ </label>
<select class="attachment-filters" name="attachment-filter" id="attachment-filter">
<?php
if ( ! empty( $views ) ) {
@@ -289,7 +297,7 @@
<?php
$this->extra_tablenav( 'bar' );
- /** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
+ /** This filter is documented in wp-admin/includes/class-wp-list-table.php */
$views = apply_filters( "views_{$this->screen->id}", array() );
// Back compat for pre-4.0 view links.
@@ -304,15 +312,23 @@
</div>
<div class="search-form">
- <label for="media-search-input" class="media-search-input-label"><?php esc_html_e( 'Search' ); ?></label>
- <input type="search" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>">
+ <p class="search-box">
+ <label class="screen-reader-text" for="media-search-input">
+ <?php
+ /* translators: Hidden accessibility text. */
+ esc_html_e( 'Search Media' );
+ ?>
+ </label>
+ <input type="search" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>">
+ <input id="search-submit" type="submit" class="button" value="<?php esc_attr_e( 'Search Media' ); ?>">
+ </p>
</div>
</div>
<?php
}
/**
- * @return array
+ * @return string[] Array of column titles keyed by their column name.
*/
public function get_columns() {
$posts_columns = array();
@@ -350,8 +366,14 @@
/* translators: Column name. */
if ( ! $this->detached ) {
$posts_columns['parent'] = _x( 'Uploaded to', 'column name' );
+
if ( post_type_supports( 'attachment', 'comments' ) ) {
- $posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+ $posts_columns['comments'] = sprintf(
+ '<span class="vers comment-grey-bubble" title="%1$s" aria-hidden="true"></span><span class="screen-reader-text">%2$s</span>',
+ esc_attr__( 'Comments' ),
+ /* translators: Hidden accessibility text. */
+ __( 'Comments' )
+ );
}
}
@@ -375,11 +397,11 @@
*/
protected function get_sortable_columns() {
return array(
- 'title' => 'title',
- 'author' => 'author',
- 'parent' => 'parent',
- 'comments' => 'comment_count',
- 'date' => array( 'date', true ),
+ 'title' => array( 'title', false, _x( 'File', 'column name' ), __( 'Table ordered by File Name.' ) ),
+ 'author' => array( 'author', false, __( 'Author' ), __( 'Table ordered by Author.' ) ),
+ 'parent' => array( 'parent', false, _x( 'Uploaded to', 'column name' ), __( 'Table ordered by Uploaded To.' ) ),
+ 'comments' => array( 'comment_count', __( 'Comments' ), false, __( 'Table ordered by Comments.' ) ),
+ 'date' => array( 'date', true, __( 'Date' ), __( 'Table ordered by Date.' ), 'desc' ),
);
}
@@ -397,13 +419,15 @@
if ( current_user_can( 'edit_post', $post->ID ) ) {
?>
- <label class="screen-reader-text" for="cb-select-<?php echo $post->ID; ?>">
+ <input type="checkbox" name="media[]" id="cb-select-<?php echo $post->ID; ?>" value="<?php echo $post->ID; ?>" />
+ <label for="cb-select-<?php echo $post->ID; ?>">
+ <span class="screen-reader-text">
<?php
- /* translators: %s: Attachment title. */
+ /* translators: Hidden accessibility text. %s: Attachment title. */
printf( __( 'Select %s' ), _draft_or_post_title() );
?>
+ </span>
</label>
- <input type="checkbox" name="media[]" id="cb-select-<?php echo $post->ID; ?>" value="<?php echo $post->ID; ?>" />
<?php
}
}
@@ -418,8 +442,18 @@
public function column_title( $post ) {
list( $mime ) = explode( '/', $post->post_mime_type );
+ $attachment_id = $post->ID;
+
+ if ( has_post_thumbnail( $post ) ) {
+ $thumbnail_id = get_post_thumbnail_id( $post );
+
+ if ( ! empty( $thumbnail_id ) ) {
+ $attachment_id = $thumbnail_id;
+ }
+ }
+
$title = _draft_or_post_title();
- $thumb = wp_get_attachment_image( $post->ID, array( 60, 60 ), true, array( 'alt' => '' ) );
+ $thumb = wp_get_attachment_image( $attachment_id, array( 60, 60 ), true, array( 'alt' => '' ) );
$link_start = '';
$link_end = '';
@@ -451,7 +485,12 @@
?>
</strong>
<p class="filename">
- <span class="screen-reader-text"><?php _e( 'File name:' ); ?> </span>
+ <span class="screen-reader-text">
+ <?php
+ /* translators: Hidden accessibility text. */
+ _e( 'File name:' );
+ ?>
+ </span>
<?php
$file = get_attached_file( $post->ID );
echo esc_html( wp_basename( $file ) );
@@ -479,10 +518,13 @@
* Handles the description column output.
*
* @since 4.3.0
+ * @deprecated 6.2.0
*
* @param WP_Post $post The current WP_Post object.
*/
public function column_desc( $post ) {
+ _deprecated_function( __METHOD__, '6.2.0' );
+
echo has_excerpt() ? $post->post_excerpt : '';
}
@@ -620,7 +662,7 @@
$taxonomy = 'category';
} elseif ( 'tags' === $column_name ) {
$taxonomy = 'post_tag';
- } elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
+ } elseif ( str_starts_with( $column_name, 'taxonomy-' ) ) {
$taxonomy = substr( $column_name, 9 );
} else {
$taxonomy = false;
@@ -630,19 +672,21 @@
$terms = get_the_terms( $post->ID, $taxonomy );
if ( is_array( $terms ) ) {
- $out = array();
+ $output = array();
+
foreach ( $terms as $t ) {
$posts_in_term_qv = array();
$posts_in_term_qv['taxonomy'] = $taxonomy;
$posts_in_term_qv['term'] = $t->slug;
- $out[] = sprintf(
+ $output[] = sprintf(
'<a href="%s">%s</a>',
esc_url( add_query_arg( $posts_in_term_qv, 'upload.php' ) ),
esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) )
);
}
- echo implode( wp_get_list_item_separator(), $out );
+
+ echo implode( wp_get_list_item_separator(), $output );
} else {
echo '<span aria-hidden="true">—</span><span class="screen-reader-text">' . get_taxonomy( $taxonomy )->labels->no_terms . '</span>';
}
@@ -664,7 +708,8 @@
}
/**
- * @global WP_Post $post Global post object.
+ * @global WP_Post $post Global post object.
+ * @global WP_Query $wp_query WordPress Query object.
*/
public function display_rows() {
global $post, $wp_query;
@@ -713,126 +758,104 @@
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();'" : '';
- $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' )
- );
-
- 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,
+ $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( __( 'Attach “%s” to existing content' ), $att_title ) ),
- __( 'Attach' )
+ esc_attr( sprintf( __( 'Delete “%s” permanently' ), $att_title ) ),
+ __( 'Delete Permanently' )
);
}
- } 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' )
- );
- }
+ }
+
+ $attachment_url = wp_get_attachment_url( $post->ID );
- 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' )
- );
- }
+ if ( ! $this->is_trash ) {
+ $permalink = get_permalink( $post->ID );
- 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 ( $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 ( $attachment_url ) {
$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 ) ),
+ esc_url( $attachment_url ),
/* translators: %s: Attachment title. */
esc_attr( sprintf( __( 'Copy “%s” URL to clipboard' ), $att_title ) ),
- __( 'Copy URL to clipboard' ),
+ __( 'Copy URL' ),
__( 'Copied!' )
);
}
}
+ if ( $attachment_url ) {
+ $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->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' )
+ );
+ }
+
/**
* Filters the action links for each attachment in the Media 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.
@@ -857,11 +880,11 @@
return '';
}
+ // Restores the more descriptive, specific name for use within this method.
+ $post = $item;
+
$att_title = _draft_or_post_title();
- $actions = $this->_get_row_actions(
- $item, // WP_Post object for an attachment.
- $att_title
- );
+ $actions = $this->_get_row_actions( $post, $att_title );
return $this->row_actions( $actions );
}