diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-admin/includes/class-wp-media-list-table.php
--- a/wp/wp-admin/includes/class-wp-media-list-table.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/includes/class-wp-media-list-table.php Mon Oct 14 17:39:30 2019 +0200
@@ -1,13 +1,28 @@
is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' == $_REQUEST['attachment-filter'];
+ $this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' === $_REQUEST['attachment-filter'];
$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
@@ -57,38 +82,67 @@
) );
}
+ /**
+ * @global array $post_mime_types
+ * @global array $avail_post_mime_types
+ * @return array
+ */
protected function get_views() {
- global $wpdb, $post_mime_types, $avail_post_mime_types;
+ global $post_mime_types, $avail_post_mime_types;
$type_links = array();
- $_num_posts = (array) wp_count_attachments();
- $_total_posts = array_sum($_num_posts) - $_num_posts['trash'];
- $total_orphans = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1" );
- $matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts));
- foreach ( $matches as $type => $reals )
- foreach ( $reals as $real )
- $num_posts[$type] = ( isset( $num_posts[$type] ) ) ? $num_posts[$type] + $_num_posts[$real] : $_num_posts[$real];
+
+ $filter = empty( $_GET['attachment-filter'] ) ? '' : $_GET['attachment-filter'];
- $selected = empty( $_GET['attachment-filter'] ) ? ' selected="selected"' : '';
- $type_links['all'] = "';
+ $type_links['all'] = sprintf(
+ '',
+ selected( $filter, true, false ),
+ __( 'All media items' )
+ );
+
foreach ( $post_mime_types as $mime_type => $label ) {
- if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) )
+ if ( ! wp_match_mime_types( $mime_type, $avail_post_mime_types ) ) {
continue;
+ }
+
+ $selected = selected(
+ $filter && 0 === strpos( $filter, 'post_mime_type:' ) &&
+ wp_match_mime_types( $mime_type, str_replace( 'post_mime_type:', '', $filter ) ),
+ true,
+ false
+ );
- $selected = '';
- if ( !empty( $_GET['attachment-filter'] ) && strpos( $_GET['attachment-filter'], 'post_mime_type:' ) === 0 && wp_match_mime_types( $mime_type, str_replace( 'post_mime_type:', '', $_GET['attachment-filter'] ) ) )
- $selected = ' selected="selected"';
- if ( !empty( $num_posts[$mime_type] ) )
- $type_links[$mime_type] = '';
+ $type_links[$mime_type] = sprintf(
+ '',
+ esc_attr( $mime_type ),
+ $selected,
+ $label[0]
+ );
}
- $type_links['detached'] = '';
+
+ $type_links['detached'] = '';
- if ( !empty($_num_posts['trash']) )
- $type_links['trash'] = '';
+ $type_links['mine'] = sprintf(
+ '',
+ selected( 'mine' === $filter, true, false ),
+ _x( 'Mine', 'media items' )
+ );
+
+ if ( $this->is_trash || ( defined( 'MEDIA_TRASH') && MEDIA_TRASH ) ) {
+ $type_links['trash'] = sprintf(
+ '',
+ selected( 'trash' === $filter, true, false ),
+ _x( 'Trash', 'attachment filter' )
+ );
+ }
return $type_links;
}
+ /**
+ *
+ * @return array
+ */
protected function get_bulk_actions() {
$actions = array();
if ( MEDIA_TRASH ) {
@@ -96,14 +150,14 @@
$actions['untrash'] = __( 'Restore' );
$actions['delete'] = __( 'Delete Permanently' );
} else {
- $actions['trash'] = __( 'Trash' );
+ $actions['trash'] = _x( 'Trash', 'verb' );
}
} else {
$actions['delete'] = __( 'Delete Permanently' );
}
if ( $this->detached )
- $actions['attach'] = __( 'Attach to a post' );
+ $actions['attach'] = __( 'Attach' );
return $actions;
}
@@ -124,17 +178,22 @@
}
/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
- do_action( 'restrict_manage_posts' );
- submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+ do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
+
+ submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
}
- if ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
+ if ( $this->is_trash && current_user_can( 'edit_others_posts' ) && $this->has_items() ) {
submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
} ?>
get_views();
+
+ $this->screen->render_screen_reader_content( 'heading_views' );
?>
';
- $posts_columns['icon'] = '';
/* translators: column name */
$posts_columns['title'] = _x( 'File', 'column name' );
$posts_columns['author'] = __( 'Author' );
@@ -215,7 +287,7 @@
$taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
/**
- * Filter the taxonomy columns for attachments in the Media list table.
+ * Filters the taxonomy columns for attachments in the Media list table.
*
* @since 3.5.0
*
@@ -226,13 +298,13 @@
$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
foreach ( $taxonomies as $taxonomy ) {
- if ( 'category' == $taxonomy )
+ if ( 'category' === $taxonomy ) {
$column_key = 'categories';
- elseif ( 'post_tag' == $taxonomy )
+ } elseif ( 'post_tag' === $taxonomy ) {
$column_key = 'tags';
- else
+ } else {
$column_key = 'taxonomy-' . $taxonomy;
-
+ }
$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
}
@@ -240,12 +312,12 @@
if ( !$this->detached ) {
$posts_columns['parent'] = _x( 'Uploaded to', 'column name' );
if ( post_type_supports( 'attachment', 'comments' ) )
- $posts_columns['comments'] = '';
+ $posts_columns['comments'] = '';
}
/* translators: column name */
$posts_columns['date'] = _x( 'Date', 'column name' );
/**
- * Filter the Media list table columns.
+ * Filters the Media list table columns.
*
* @since 2.5.0
*
@@ -253,11 +325,13 @@
* @param bool $detached Whether the list table contains media not attached
* to any posts. Default true.
*/
- $posts_columns = apply_filters( 'manage_media_columns', $posts_columns, $this->detached );
-
- return $posts_columns;
+ return apply_filters( 'manage_media_columns', $posts_columns, $this->detached );
}
+ /**
+ *
+ * @return array
+ */
protected function get_sortable_columns() {
return array(
'title' => 'title',
@@ -268,194 +342,223 @@
);
}
- public function display_rows() {
- global $post;
-
- add_filter( 'the_title','esc_html' );
-
- while ( have_posts() ) : the_post();
- $user_can_edit = current_user_can( 'edit_post', $post->ID );
-
- if ( $this->is_trash && $post->post_status != 'trash'
- || !$this->is_trash && $post->post_status == 'trash' )
- continue;
-
- $post_owner = ( get_current_user_id() == $post->post_author ) ? 'self' : 'other';
- $att_title = _draft_or_post_title();
-?>
-
-ID ) ) { ?>
+
+
+ get_column_info();
-foreach ( $columns as $column_name => $column_display_name ) {
- $class = "class='$column_name column-$column_name'";
-
- $style = '';
- if ( in_array( $column_name, $hidden ) )
- $style = ' style="display:none;"';
-
- $attributes = $class . $style;
-
- switch ( $column_name ) {
-
- case 'cb':
-?>
-
-
-
-
-
- |
-post_mime_type );
- $attributes = 'class="column-icon media-icon ' . $mime . '-icon"' . $style;
-?>
- >ID, array( 80, 60 ), true ) ) {
- if ( $this->is_trash || ! $user_can_edit ) {
- echo $thumb;
- } else {
-?>
-
-
-
+
+ $title = _draft_or_post_title();
+ $thumb = wp_get_attachment_image( $post->ID, array( 60, 60 ), true, array( 'alt' => '' ) );
+ $link_start = $link_end = '';
-
- |
-ID ) && ! $this->is_trash ) {
+ $link_start = sprintf(
+ '',
+ get_edit_post_link( $post->ID ),
+ /* translators: %s: attachment title */
+ esc_attr( sprintf( __( '“%s” (Edit)' ), $title ) )
+ );
+ $link_end = '';
+ }
- case 'title':
-?>
- >
- is_trash || ! $user_can_edit ) {
- echo $att_title;
- } else { ?>
-
-
-
- guid ); ?>
-row_actions( $this->_get_row_actions( $post, $att_title ) );
-?>
- |
-
+ >
+
+
+
+
+
+
+ ID );
+ echo esc_html( wp_basename( $file ) );
+ ?>
+
+
- >%s',
- esc_url( add_query_arg( array( 'author' => get_the_author_meta('ID') ), 'upload.php' ) ),
- get_the_author()
- );
- ?> |
-%s',
+ esc_url( add_query_arg( array( 'author' => get_the_author_meta('ID') ), 'upload.php' ) ),
+ get_the_author()
+ );
+ }
- case 'desc':
-?>
- >post_excerpt : ''; ?> |
-post_excerpt : '';
+ }
- case 'date':
- if ( '0000-00-00 00:00:00' == $post->post_date ) {
+ /**
+ * Handles the date column output.
+ *
+ * @since 4.3.0
+ *
+ * @param WP_Post $post The current WP_Post object.
+ */
+ public function column_date( $post ) {
+ if ( '0000-00-00 00:00:00' === $post->post_date ) {
$h_time = __( 'Unpublished' );
} else {
$m_time = $post->post_date;
$time = get_post_time( 'G', true, $post, false );
if ( ( abs( $t_diff = time() - $time ) ) < DAY_IN_SECONDS ) {
- if ( $t_diff < 0 )
+ if ( $t_diff < 0 ) {
$h_time = sprintf( __( '%s from now' ), human_time_diff( $time ) );
- else
+ } else {
$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
+ }
} else {
$h_time = mysql2date( __( 'Y/m/d' ), $m_time );
}
}
-?>
- > |
-post_parent > 0 )
+ /**
+ * Handles the parent column output.
+ *
+ * @since 4.3.0
+ *
+ * @param WP_Post $post The current WP_Post object.
+ */
+ public function column_parent( $post ) {
+ $user_can_edit = current_user_can( 'edit_post', $post->ID );
+
+ if ( $post->post_parent > 0 ) {
$parent = get_post( $post->post_parent );
- else
+ } else {
$parent = false;
+ }
if ( $parent ) {
$title = _draft_or_post_title( $post->post_parent );
$parent_type = get_post_type_object( $parent->post_type );
+
+ if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $post->post_parent ) ) {
?>
- >
- show_ui && current_user_can( 'edit_post', $post->post_parent ) ) { ?>
-
- ,
-
- $post->post_parent,
- 'media[]' => $post->ID,
- '_wpnonce' => wp_create_nonce( 'bulk-' . $this->_args['plural'] )
- ), 'upload.php' ); ?>
-
-
- |
-
+ post_parent ) ) {
+?>
+ $post->post_parent,
+ 'media[]' => $post->ID,
+ '_wpnonce' => wp_create_nonce( 'bulk-' . $this->_args['plural'] )
+ ), 'upload.php' );
+ printf(
+ '
%s',
+ $detach_url,
+ /* translators: %s: title of the post the attachment is attached to */
+ esc_attr( sprintf( __( 'Detach from “%s”' ), $title ) ),
+ __( 'Detach' )
+ );
+ endif;
} else {
-?>
- >
-
-
-
- |
-
+ post_parent );
+ printf(
+ '
%s',
+ $post->ID,
+ /* translators: %s: attachment title */
+ esc_attr( sprintf( __( 'Attach “%s” to existing content' ), $title ) ),
+ __( 'Attach' )
+ );
+ }
}
- break;
+ }
- case 'comments':
- $attributes = 'class="comments column-comments num"' . $style;
-?>
- >
-
-ID );
+ /**
+ * Handles the comments column output.
+ *
+ * @since 4.3.0
+ *
+ * @param WP_Post $post The current WP_Post object.
+ */
+ public function column_comments( $post ) {
+ echo ' ';
+
+ if ( isset( $this->comment_pending_count[ $post->ID ] ) ) {
+ $pending_comments = $this->comment_pending_count[ $post->ID ];
+ } else {
+ $pending_comments = get_pending_comments_num( $post->ID );
+ }
$this->comments_bubble( $post->ID, $pending_comments );
-?>
-
- |
-';
+ }
- default:
- if ( 'categories' == $column_name )
+ /**
+ * Handles output for the default column.
+ *
+ * @since 4.3.0
+ *
+ * @param WP_Post $post The current WP_Post object.
+ * @param string $column_name Current column name.
+ */
+ public function column_default( $post, $column_name ) {
+ if ( 'categories' === $column_name ) {
$taxonomy = 'category';
- elseif ( 'tags' == $column_name )
+ } elseif ( 'tags' === $column_name ) {
$taxonomy = 'post_tag';
- elseif ( 0 === strpos( $column_name, 'taxonomy-' ) )
+ } elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
$taxonomy = substr( $column_name, 9 );
- else
+ } else {
$taxonomy = false;
+ }
if ( $taxonomy ) {
- echo '';
- if ( $terms = get_the_terms( $post->ID, $taxonomy ) ) {
+ $terms = get_the_terms( $post->ID, $taxonomy );
+ if ( is_array( $terms ) ) {
$out = array();
foreach ( $terms as $t ) {
$posts_in_term_qv = array();
@@ -470,76 +573,177 @@
/* translators: used between list items, there is a space after the comma */
echo join( __( ', ' ), $out );
} else {
- echo '—';
+ echo '—' . get_taxonomy( $taxonomy )->labels->no_terms . '';
}
- echo ' | ';
- break;
+
+ return;
}
-?>
- >ID );
- ?> |
-ID );
}
-}
-?>
-
-posts, 'ID' );
+ reset( $wp_query->posts );
+
+ $this->comment_pending_count = get_pending_comments_num( $post_ids );
+
+ add_filter( 'the_title','esc_html' );
+
+ while ( have_posts() ) : the_post();
+ if (
+ ( $this->is_trash && $post->post_status != 'trash' )
+ || ( ! $this->is_trash && $post->post_status === 'trash' )
+ ) {
+ continue;
+ }
+ $post_owner = ( get_current_user_id() == $post->post_author ) ? 'self' : 'other';
+ ?>
+
+ single_row_columns( $post ); ?>
+
+ detached ) {
- if ( current_user_can( 'edit_post', $post->ID ) )
- $actions['edit'] = '' . __( 'Edit' ) . '';
- if ( current_user_can( 'delete_post', $post->ID ) )
+ if ( current_user_can( 'edit_post', $post->ID ) ) {
+ $actions['edit'] = sprintf(
+ '%s',
+ 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 ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
- $actions['trash'] = "ID ) . "'>" . __( 'Trash' ) . "";
+ $actions['trash'] = sprintf(
+ '%s',
+ 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'] = "ID ) . "'>" . __( 'Delete Permanently' ) . "";
+ $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
+ $actions['delete'] = sprintf(
+ '%s',
+ 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' )
+ );
}
- $actions['view'] = '' . __( 'View' ) . '';
- if ( current_user_can( 'edit_post', $post->ID ) )
- $actions['attach'] = ''.__( 'Attach' ).'';
+ }
+ $actions['view'] = sprintf(
+ '%s',
+ 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(
+ '%s',
+ $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'] = '' . __( 'Edit' ) . '';
+ if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash ) {
+ $actions['edit'] = sprintf(
+ '%s',
+ 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'] = "ID ) . "'>" . __( 'Restore' ) . "";
- elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH )
- $actions['trash'] = "ID ) . "'>" . __( 'Trash' ) . "";
- if ( $this->is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) {
+ if ( $this->is_trash ) {
+ $actions['untrash'] = sprintf(
+ '%s',
+ 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(
+ '%s',
+ 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 || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH ) {
$delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
- $actions['delete'] = "ID ) . "'>" . __( 'Delete Permanently' ) . "";
+ $actions['delete'] = sprintf(
+ '%s',
+ 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 ) {
- $title =_draft_or_post_title( $post->post_parent );
- $actions['view'] = '' . __( 'View' ) . '';
+ if ( ! $this->is_trash ) {
+ $actions['view'] = sprintf(
+ '%s',
+ get_permalink( $post->ID ),
+ /* translators: %s: attachment title */
+ esc_attr( sprintf( __( 'View “%s”' ), $att_title ) ),
+ __( 'View' )
+ );
}
}
/**
- * Filter the action links for each attachment in the Media list table.
+ * Filters the action links for each attachment in the Media list table.
*
* @since 2.8.0
*
@@ -549,8 +753,25 @@
* @param bool $detached Whether the list table contains media not attached
* to any posts. Default true.
*/
- $actions = apply_filters( 'media_row_actions', $actions, $post, $this->detached );
+ return apply_filters( 'media_row_actions', $actions, $post, $this->detached );
+ }
- return $actions;
+ /**
+ * Generates and displays row action links.
+ *
+ * @since 4.3.0
+ *
+ * @param object $post Attachment being acted upon.
+ * @param string $column_name Current column name.
+ * @param string $primary Primary column name.
+ * @return string Row actions output for media attachments.
+ */
+ protected function handle_row_actions( $post, $column_name, $primary ) {
+ if ( $primary !== $column_name ) {
+ return '';
+ }
+
+ $att_title = _draft_or_post_title();
+ return $this->row_actions( $this->_get_row_actions( $post, $att_title ) );
}
}