X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/7f1521bf193b382565eb753043c161f4cb3fcda7..refs/tags/wordpress-4.4:/wp-admin/includes/class-wp-media-list-table.php diff --git a/wp-admin/includes/class-wp-media-list-table.php b/wp-admin/includes/class-wp-media-list-table.php index 9ebd5c0c..3e0f41cf 100644 --- a/wp-admin/includes/class-wp-media-list-table.php +++ b/wp-admin/includes/class-wp-media-list-table.php @@ -1,13 +1,29 @@ 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 +84,59 @@ class WP_Media_List_Table extends WP_List_Table { ) ); } + /** + * @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]; - - $selected = empty( $_GET['attachment-filter'] ) ? ' selected="selected"' : ''; - $type_links['all'] = "'; + + $filter = empty( $_GET['attachment-filter'] ) ? '' : $_GET['attachment-filter']; + + $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 = ''; - 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['detached'] = ''; + $selected = selected( + $filter && 0 === strpos( $filter, 'post_mime_type:' ) && + wp_match_mime_types( $mime_type, str_replace( 'post_mime_type:', '', $filter ) ), + true, + false + ); - if ( !empty($_num_posts['trash']) ) - $type_links['trash'] = ''; + $type_links[$mime_type] = sprintf( + '', + esc_attr( $mime_type ), + $selected, + $label[0] + ); + } + $type_links['detached'] = ''; + if ( $this->is_trash || ( defined( 'MEDIA_TRASH') && MEDIA_TRASH ) ) { + $type_links['trash'] = sprintf( + '', + selected( 'trash' === $filter, true, false ), + __( 'Trash' ) + ); + } return $type_links; } + /** + * + * @return array + */ protected function get_bulk_actions() { $actions = array(); if ( MEDIA_TRASH ) { @@ -103,7 +151,7 @@ class WP_Media_List_Table extends WP_List_Table { } if ( $this->detached ) - $actions['attach'] = __( 'Attach to a post' ); + $actions['attach'] = __( 'Attach' ); return $actions; } @@ -124,7 +172,8 @@ class WP_Media_List_Table extends WP_List_Table { } /** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */ - do_action( 'restrict_manage_posts' ); + do_action( 'restrict_manage_posts', $this->screen->post_type ); + submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); } @@ -135,6 +184,10 @@ class WP_Media_List_Table extends WP_List_Table { get_views(); + + $this->screen->render_screen_reader_content( 'heading_views' ); ?>
@@ -203,10 +267,13 @@ class WP_Media_List_Table extends WP_List_Table { '; - $posts_columns['icon'] = ''; /* translators: column name */ $posts_columns['title'] = _x( 'File', 'column name' ); $posts_columns['author'] = __( 'Author' ); @@ -226,13 +293,13 @@ class WP_Media_List_Table extends WP_List_Table { $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,7 +307,7 @@ class WP_Media_List_Table extends WP_List_Table { if ( !$this->detached ) { $posts_columns['parent'] = _x( 'Uploaded to', 'column name' ); if ( post_type_supports( 'attachment', 'comments' ) ) - $posts_columns['comments'] = ''; + $posts_columns['comments'] = '' . __( 'Comments' ) . ''; } /* translators: column name */ $posts_columns['date'] = _x( 'Date', 'column name' ); @@ -253,11 +320,13 @@ class WP_Media_List_Table extends WP_List_Table { * @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 +337,216 @@ class WP_Media_List_Table extends WP_List_Table { ); } - 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(); -?> - -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;"'; + /** + * Handles the checkbox column output. + * + * @since 4.3.0 + * @access public + * + * @param WP_Post $post The current WP_Post object. + */ + public function column_cb( $post ) { + if ( current_user_can( 'edit_post', $post->ID ) ) { ?> + + + post_mime_type ); - switch ( $column_name ) { + $title = _draft_or_post_title(); + $thumb = wp_get_attachment_image( $post->ID, array( 60, 60 ), true, array( 'alt' => '' ) ); + $link_start = $link_end = ''; - case 'cb': -?> - - - - - - -ID ) && ! $this->is_trash ) { + $link_start = ''; + $link_end = ''; + } - case 'icon': - list( $mime ) = explode( '/', $post->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 { -?> - - - + $class = $thumb ? ' class="has-media-icon"' : ''; - - - + > + + + + - case 'title': -?> - > - is_trash || ! $user_can_edit ) { - echo $att_title; - } else { ?> - - - -

guid ); ?>

-row_actions( $this->_get_row_actions( $post, $att_title ) ); -?> - - + + + + +

+ + ID ); + echo 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 + * @access public + * + * @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 ) + echo $h_time; + } + + /** + * Handles the parent column output. + * + * @since 4.3.0 + * @access public + * + * @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 ); ?> - > - 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' ); ?> - - - - + 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' ); ?> + + - >
+ _e( '(Unattached)' ); ?>
- - - > -
-ID ); + /** + * Handles the comments column output. + * + * @since 4.3.0 + * @access public + * + * @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 ); -?> -
- -'; + } + + /** + * Handles output for the default column. + * + * @since 4.3.0 + * @access public + * + * @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,37 +561,72 @@ foreach ( $columns as $column_name => $column_display_name ) { /* 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 ); ?> + + $column_display_name ) { * @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 + * @access protected + * + * @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 ) ); } }