]> scripts.mit.edu Git - autoinstalls/wordpress.git/blobdiff - wp-admin/includes/class-wp-media-list-table.php
WordPress 4.1.2
[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-media-list-table.php
index 9c63ca3267691dca7bbc5d156eeb00988ec0b07c..377e3c0201bdda2d4ab79070ff313f8faf0320f1 100644 (file)
@@ -9,29 +9,42 @@
  */
 class WP_Media_List_Table extends WP_List_Table {
 
-       function __construct() {
-               $this->detached = isset( $_REQUEST['detached'] ) || isset( $_REQUEST['find_detached'] );
+       /**
+        * Constructor.
+        *
+        * @since 3.1.0
+        * @access public
+        *
+        * @see WP_List_Table::__construct() for more information on default arguments.
+        *
+        * @param array $args An associative array of arguments.
+        */
+       public function __construct( $args = array() ) {
+               $this->detached = ( isset( $_REQUEST['attachment-filter'] ) && 'detached' === $_REQUEST['attachment-filter'] );
+
+               $this->modes = array(
+                       'list' => __( 'List View' ),
+                       'grid' => __( 'Grid View' )
+               );
 
                parent::__construct( array(
-                       'plural' => 'media'
+                       'plural' => 'media',
+                       'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
                ) );
        }
 
-       function ajax_user_can() {
+       public function ajax_user_can() {
                return current_user_can('upload_files');
        }
 
-       function prepare_items() {
-               global $lost, $wpdb, $wp_query, $post_mime_types, $avail_post_mime_types;
-
-               $q = $_REQUEST;
+       public function prepare_items() {
+               global $wp_query, $post_mime_types, $avail_post_mime_types, $mode;
 
-               if ( !empty( $lost ) )
-                       $q['post__in'] = implode( ',', $lost );
+               list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $_REQUEST );
 
-               list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $q );
+               $this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' == $_REQUEST['attachment-filter'];
 
-               $this->is_trash = isset( $_REQUEST['status'] ) && 'trash' == $_REQUEST['status'];
+               $mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
 
                $this->set_pagination_args( array(
                        'total_items' => $wp_query->found_posts,
@@ -40,73 +53,85 @@ class WP_Media_List_Table extends WP_List_Table {
                ) );
        }
 
-       function get_views() {
+       protected function get_views() {
                global $wpdb, $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'];
-               if ( !isset( $total_orphans ) )
-                               $total_orphans = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1" );
+               $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];
 
-               $class = ( empty($_GET['post_mime_type']) && !$this->detached && !isset($_GET['status']) ) ? ' class="current"' : '';
-               $type_links['all'] = "<a href='upload.php'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $_total_posts, 'uploaded files' ), number_format_i18n( $_total_posts ) ) . '</a>';
+               $selected = empty( $_GET['attachment-filter'] ) ? ' selected="selected"' : '';
+               $type_links['all'] = "<option value=''$selected>" . sprintf( _nx( 'All (%s)', 'All (%s)', $_total_posts, 'uploaded files' ), number_format_i18n( $_total_posts ) ) . '</option>';
                foreach ( $post_mime_types as $mime_type => $label ) {
-                       $class = '';
-
                        if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) )
                                continue;
 
-                       if ( !empty($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
-                               $class = ' class="current"';
+                       $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] = "<a href='upload.php?post_mime_type=$mime_type'$class>" . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . '</a>';
+                               $type_links[$mime_type] = '<option value="post_mime_type:' . sanitize_mime_type( $mime_type ) . '"' . $selected . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . '</option>';
                }
-               $type_links['detached'] = '<a href="upload.php?detached=1"' . ( $this->detached ? ' class="current"' : '' ) . '>' . sprintf( _nx( 'Unattached <span class="count">(%s)</span>', 'Unattached <span class="count">(%s)</span>', $total_orphans, 'detached files' ), number_format_i18n( $total_orphans ) ) . '</a>';
+               $type_links['detached'] = '<option value="detached"' . ( $this->detached ? ' selected="selected"' : '' ) . '>' . sprintf( _nx( 'Unattached (%s)', 'Unattached (%s)', $total_orphans, 'detached files' ), number_format_i18n( $total_orphans ) ) . '</option>';
 
                if ( !empty($_num_posts['trash']) )
-                       $type_links['trash'] = '<a href="upload.php?status=trash"' . ( (isset($_GET['status']) && $_GET['status'] == 'trash' ) ? ' class="current"' : '') . '>' . sprintf( _nx( 'Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>', $_num_posts['trash'], 'uploaded files' ), number_format_i18n( $_num_posts['trash'] ) ) . '</a>';
+                       $type_links['trash'] = '<option value="trash"' . ( (isset($_GET['attachment-filter']) && $_GET['attachment-filter'] == 'trash' ) ? ' selected="selected"' : '') . '>' . sprintf( _nx( 'Trash (%s)', 'Trash (%s)', $_num_posts['trash'], 'uploaded files' ), number_format_i18n( $_num_posts['trash'] ) ) . '</option>';
 
                return $type_links;
        }
 
-       function get_bulk_actions() {
+       protected function get_bulk_actions() {
                $actions = array();
-               $actions['delete'] = __( 'Delete Permanently' );
+               if ( MEDIA_TRASH ) {
+                       if ( $this->is_trash ) {
+                               $actions['untrash'] = __( 'Restore' );
+                               $actions['delete'] = __( 'Delete Permanently' );
+                       } else {
+                               $actions['trash'] = __( 'Trash' );
+                       }
+               } else {
+                       $actions['delete'] = __( 'Delete Permanently' );
+               }
+
                if ( $this->detached )
                        $actions['attach'] = __( 'Attach to a post' );
 
                return $actions;
        }
 
-       function extra_tablenav( $which ) {
+       /**
+        * @param string $which
+        */
+       protected function extra_tablenav( $which ) {
+               if ( 'bar' !== $which ) {
+                       return;
+               }
 ?>
-               <div class="alignleft actions">
+               <div class="actions">
 <?php
-               if ( 'top' == $which && !is_singular() && !$this->detached && !$this->is_trash ) {
-                       $this->months_dropdown( 'attachment' );
+               if ( ! is_singular() ) {
+                       if ( ! $this->is_trash ) {
+                               $this->months_dropdown( 'attachment' );
+                       }
 
+                       /** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
                        do_action( 'restrict_manage_posts' );
-                       submit_button( __( 'Filter' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) );
+                       submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
                }
 
-               if ( $this->detached ) {
-                       submit_button( __( 'Scan for lost attachments' ), 'secondary', 'find_detached', false );
-               } elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
-                       submit_button( __( 'Empty Trash' ), 'button-secondary apply', 'delete_all', false );
+               if ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
+                       submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
                } ?>
                </div>
 <?php
        }
 
-       function current_action() {
-               if ( isset( $_REQUEST['find_detached'] ) )
-                       return 'find_detached';
-
+       public function current_action() {
                if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) )
                        return 'attach';
 
@@ -116,36 +141,123 @@ class WP_Media_List_Table extends WP_List_Table {
                return parent::current_action();
        }
 
-       function has_items() {
+       public function has_items() {
                return have_posts();
        }
 
-       function no_items() {
+       public function no_items() {
                _e( 'No media attachments found.' );
        }
 
-       function get_columns() {
+       /**
+        * @param string $which
+        */
+       protected function pagination( $which ) {
+               parent::pagination( $which );
+       }
+
+       /**
+        * Override parent views so we can use the filter bar display.
+        */
+       public function views() {
+               global $mode;
+
+               $views = $this->get_views();
+?>
+<div class="wp-filter">
+       <div class="filter-items">
+               <?php $this->view_switcher( $mode ); ?>
+
+               <select class="attachment-filters" name="attachment-filter">
+                       <?php
+                       if ( ! empty( $views ) ) {
+                               foreach ( $views as $class => $view ) {
+                                       echo "\t$view\n";
+                               }
+                       }
+                       ?>
+               </select>
+
+<?php
+               $this->extra_tablenav( 'bar' );
+
+               /** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
+               $views = apply_filters( "views_{$this->screen->id}", array() );
+
+               // Back compat for pre-4.0 view links.
+               if ( ! empty( $views ) ) {
+                       echo '<ul class="filter-links">';
+                       foreach ( $views as $class => $view ) {
+                               echo "<li class='$class'>$view</li>";
+                       }
+                       echo '</ul>';
+               }
+?>
+       </div>
+
+       <div class="search-form">
+               <label for="media-search-input" class="screen-reader-text"><?php esc_html_e( 'Search Media' ); ?></label>
+               <input type="search" placeholder="<?php esc_attr_e( 'Search' ) ?>" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>"></div>
+       </div>
+       <?php
+       }
+
+       public function get_columns() {
                $posts_columns = array();
                $posts_columns['cb'] = '<input type="checkbox" />';
                $posts_columns['icon'] = '';
                /* translators: column name */
                $posts_columns['title'] = _x( 'File', 'column name' );
                $posts_columns['author'] = __( 'Author' );
-               //$posts_columns['tags'] = _x( 'Tags', 'column name' );
+
+               $taxonomies = get_taxonomies_for_attachments( 'objects' );
+               $taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
+
+               /**
+                * Filter the taxonomy columns for attachments in the Media list table.
+                *
+                * @since 3.5.0
+                *
+                * @param array  $taxonomies An array of registered taxonomies to show for attachments.
+                * @param string $post_type  The post type. Default 'attachment'.
+                */
+               $taxonomies = apply_filters( 'manage_taxonomies_for_attachment_columns', $taxonomies, 'attachment' );
+               $taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
+
+               foreach ( $taxonomies as $taxonomy ) {
+                       if ( 'category' == $taxonomy )
+                               $column_key = 'categories';
+                       elseif ( 'post_tag' == $taxonomy )
+                               $column_key = 'tags';
+                       else
+                               $column_key = 'taxonomy-' . $taxonomy;
+
+                       $posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
+               }
+
                /* translators: column name */
                if ( !$this->detached ) {
-                       $posts_columns['parent'] = _x( 'Attached to', 'column name' );
+                       $posts_columns['parent'] = _x( 'Uploaded to', 'column name' );
                        if ( post_type_supports( 'attachment', 'comments' ) )
-                               $posts_columns['comments'] = '<span class="vers"><img alt="' . esc_attr__( 'Comments' ) . '" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></span>';
+                               $posts_columns['comments'] = '<span class="vers"><span title="' . esc_attr__( 'Comments' ) . '" class="comment-grey-bubble"></span></span>';
                }
                /* translators: column name */
                $posts_columns['date'] = _x( 'Date', 'column name' );
+               /**
+                * Filter the Media list table columns.
+                *
+                * @since 2.5.0
+                *
+                * @param array $posts_columns An array of columns displayed in the Media 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;
        }
 
-       function get_sortable_columns() {
+       protected function get_sortable_columns() {
                return array(
                        'title'    => 'title',
                        'author'   => 'author',
@@ -155,8 +267,8 @@ class WP_Media_List_Table extends WP_List_Table {
                );
        }
 
-       function display_rows() {
-               global $post, $id;
+       public function display_rows() {
+               global $post;
 
                add_filter( 'the_title','esc_html' );
                $alt = '';
@@ -172,7 +284,7 @@ class WP_Media_List_Table extends WP_List_Table {
                        $post_owner = ( get_current_user_id() == $post->post_author ) ? 'self' : 'other';
                        $att_title = _draft_or_post_title();
 ?>
-       <tr id='post-<?php echo $id; ?>' class='<?php echo trim( $alt . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>' valign="top">
+       <tr id="post-<?php echo $post->ID; ?>" class="<?php echo trim( $alt . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>">
 <?php
 
 list( $columns, $hidden ) = $this->get_column_info();
@@ -191,14 +303,16 @@ foreach ( $columns as $column_name => $column_display_name ) {
 ?>
                <th scope="row" class="check-column">
                        <?php if ( $user_can_edit ) { ?>
-                               <input type="checkbox" name="media[]" value="<?php the_ID(); ?>" />
+                               <label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>"><?php echo sprintf( __( 'Select %s' ), $att_title );?></label>
+                               <input type="checkbox" name="media[]" id="cb-select-<?php the_ID(); ?>" value="<?php the_ID(); ?>" />
                        <?php } ?>
                </th>
 <?php
                break;
 
        case 'icon':
-               $attributes = 'class="column-icon media-icon"' . $style;
+               list( $mime ) = explode( '/', $post->post_mime_type );
+               $attributes = 'class="column-icon media-icon ' . $mime . '-icon"' . $style;
 ?>
                <td <?php echo $attributes ?>><?php
                        if ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) {
@@ -244,25 +358,13 @@ foreach ( $columns as $column_name => $column_display_name ) {
                break;
 
        case 'author':
-?>
-               <td <?php echo $attributes ?>><?php the_author() ?></td>
-<?php
-               break;
-
-       case 'tags':
 ?>
                <td <?php echo $attributes ?>><?php
-               $tags = get_the_tags();
-               if ( !empty( $tags ) ) {
-                       $out = array();
-                       foreach ( $tags as $c )
-                               $out[] = "<a href='edit.php?tag=$c->slug'> " . esc_html( sanitize_term_field( 'name', $c->name, $c->term_id, 'post_tag', 'display' ) ) . "</a>";
-                       echo join( ', ', $out );
-               } else {
-                       _e( 'No Tags' );
-               }
-?>
-               </td>
+                       printf( '<a href="%s">%s</a>',
+                               esc_url( add_query_arg( array( 'author' => get_the_author_meta('ID') ), 'upload.php' ) ),
+                               get_the_author()
+                       );
+               ?></td>
 <?php
                break;
 
@@ -273,13 +375,12 @@ foreach ( $columns as $column_name => $column_display_name ) {
                break;
 
        case 'date':
-               if ( '0000-00-00 00:00:00' == $post->post_date && 'date' == $column_name ) {
-                       $t_time = $h_time = __( 'Unpublished' );
+               if ( '0000-00-00 00:00:00' == $post->post_date ) {
+                       $h_time = __( 'Unpublished' );
                } else {
-                       $t_time = get_the_time( __( 'Y/m/d g:i:s A' ) );
                        $m_time = $post->post_date;
                        $time = get_post_time( 'G', true, $post, false );
-                       if ( ( abs( $t_diff = time() - $time ) ) < 86400 ) {
+                       if ( ( abs( $t_diff = time() - $time ) ) < DAY_IN_SECONDS ) {
                                if ( $t_diff < 0 )
                                        $h_time = sprintf( __( '%s from now' ), human_time_diff( $time ) );
                                else
@@ -294,16 +395,20 @@ foreach ( $columns as $column_name => $column_display_name ) {
                break;
 
        case 'parent':
-               if ( $post->post_parent > 0 ) {
-                       if ( get_post( $post->post_parent ) ) {
-                               $title =_draft_or_post_title( $post->post_parent );
-                       }
+               if ( $post->post_parent > 0 )
+                       $parent = get_post( $post->post_parent );
+               else
+                       $parent = false;
+
+               if ( $parent ) {
+                       $title = _draft_or_post_title( $post->post_parent );
+                       $parent_type = get_post_type_object( $parent->post_type );
 ?>
                        <td <?php echo $attributes ?>><strong>
-                               <?php if( current_user_can( 'edit_post', $post->post_parent ) ) { ?>
+                               <?php if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $post->post_parent ) ) { ?>
                                        <a href="<?php echo get_edit_post_link( $post->post_parent ); ?>">
-                                               <?php echo $title ?></a>
-                               <?php } else {
+                                               <?php echo $title ?></a><?php
+                               } else {
                                        echo $title;
                                } ?></strong>,
                                <?php echo get_the_time( __( 'Y/m/d' ) ); ?>
@@ -312,7 +417,7 @@ foreach ( $columns as $column_name => $column_display_name ) {
                } else {
 ?>
                        <td <?php echo $attributes ?>><?php _e( '(Unattached)' ); ?><br />
-                       <?php if( $user_can_edit ) {?>
+                       <?php if ( $user_can_edit ) { ?>
                                <a class="hide-if-no-js"
                                        onclick="findPosts.open( 'media[]','<?php echo $post->ID ?>' ); return false;"
                                        href="#the-list">
@@ -338,10 +443,51 @@ foreach ( $columns as $column_name => $column_display_name ) {
                break;
 
        default:
+               if ( 'categories' == $column_name )
+                       $taxonomy = 'category';
+               elseif ( 'tags' == $column_name )
+                       $taxonomy = 'post_tag';
+               elseif ( 0 === strpos( $column_name, 'taxonomy-' ) )
+                       $taxonomy = substr( $column_name, 9 );
+               else
+                       $taxonomy = false;
+
+               if ( $taxonomy ) {
+                       echo '<td ' . $attributes . '>';
+                       if ( $terms = get_the_terms( $post->ID, $taxonomy ) ) {
+                               $out = 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( '<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' ) )
+                                       );
+                               }
+                               /* translators: used between list items, there is a space after the comma */
+                               echo join( __( ', ' ), $out );
+                       } else {
+                               echo '&#8212;';
+                       }
+                       echo '</td>';
+                       break;
+               }
 ?>
-               <td <?php echo $attributes ?>>
-                       <?php do_action( 'manage_media_custom_column', $column_name, $id ); ?>
-               </td>
+               <td <?php echo $attributes ?>><?php
+                       /**
+                        * Fires for each custom column in the Media list table.
+                        *
+                        * Custom columns are registered using the 'manage_media_columns' filter.
+                        *
+                        * @since 2.5.0
+                        *
+                        * @param string $column_name Name of the custom column.
+                        * @param int    $post_id     Attachment ID.
+                        */
+                       do_action( 'manage_media_custom_column', $column_name, $post->ID );
+               ?></td>
 <?php
                break;
        }
@@ -351,7 +497,11 @@ foreach ( $columns as $column_name => $column_display_name ) {
 <?php endwhile;
        }
 
-       function _get_row_actions( $post, $att_title ) {
+       /**
+        * @param WP_Post $post
+        * @param string  $att_title
+        */
+       private function _get_row_actions( $post, $att_title ) {
                $actions = array();
 
                if ( $this->detached ) {
@@ -359,10 +509,10 @@ foreach ( $columns as $column_name => $column_display_name ) {
                                $actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '">' . __( 'Edit' ) . '</a>';
                        if ( current_user_can( 'delete_post', $post->ID ) )
                                if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
-                                       $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-attachment_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+                                       $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
                                } else {
                                        $delete_ays = !MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
-                                       $actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-attachment_' . $post->ID ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+                                       $actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ) . "'>" . __( 'Delete Permanently' ) . "</a>";
                                }
                        $actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $att_title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
                        if ( current_user_can( 'edit_post', $post->ID ) )
@@ -373,12 +523,12 @@ foreach ( $columns as $column_name => $column_display_name ) {
                                $actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '">' . __( 'Edit' ) . '</a>';
                        if ( current_user_can( 'delete_post', $post->ID ) ) {
                                if ( $this->is_trash )
-                                       $actions['untrash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$post->ID", 'untrash-attachment_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
+                                       $actions['untrash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$post->ID", 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
                                elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH )
-                                       $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-attachment_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+                                       $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
                                if ( $this->is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) {
                                        $delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
-                                       $actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-attachment_' . $post->ID ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+                                       $actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ) . "'>" . __( 'Delete Permanently' ) . "</a>";
                                }
                        }
                        if ( !$this->is_trash ) {
@@ -387,10 +537,19 @@ foreach ( $columns as $column_name => $column_display_name ) {
                        }
                }
 
+               /**
+                * Filter the action links for each attachment in the Media list table.
+                *
+                * @since 2.8.0
+                *
+                * @param array   $actions  An array of action links for each attachment.
+                *                          Default 'Edit', 'Delete Permanently', 'View'.
+                * @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.
+                */
                $actions = apply_filters( 'media_row_actions', $actions, $post, $this->detached );
 
                return $actions;
        }
 }
-
-?>