Ticket #40879: 40879.diff

wp-admin/includes/class-wp-media-list-table.php

@@ -142 +142 @@
                 if ( MEDIA_TRASH ) {
                         if ( $this->is_trash ) {
                                 $actions['untrash'] = __( 'Restore' );
-                                $actions['delete'] = __( 'Delete Permanently' );
                         } else {
                                 $actions['trash'] = _x( 'Trash', 'verb' );
                         }
-                } else {
-                        $actions['delete'] = __( 'Delete Permanently' );
                 }
+                $actions['delete'] = __( 'Delete Permanently' );
 
                 if ( $this->detached )
                         $actions['attach'] = __( 'Attach' );
@@ -722 +720 @@
                                                 esc_attr( sprintf( __( 'Move “%s” to the Trash' ), $att_title ) ),
                                                 _x( 'Trash', 'verb' )
                                         );
+                                        $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&amp;post=$post->ID", 'delete-post_' . $post->ID ),
+                                                $delete_ays,
+                                                /* translators: %s: attachment title */
+                                                esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; permanently' ), $att_title ) ),
+                                                __( 'Delete Permanently' )
+                                        );
                                 }
                                 if ( $this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH ) {
                                         $delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';

wp-admin/includes/meta-boxes.php

@@ -338 +338 @@
         <?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 ) . "'>" . _x( 'Trash', 'verb' ) . "</a>";
-                } else {
+                        echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . _x( 'Trash', 'verb' ) . "</a><br />";
+                }
                         $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
                         echo  "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
-                }
         ?>
         </div>
 

wp-includes/media-template.php

@@ -433 +433 @@
                                 <# if ( ! data.uploading && data.can.remove ) { #> |
                                         <?php if ( MEDIA_TRASH ): ?>
                                                 <# if ( 'trash' === data.status ) { #>
-                                                        <button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button>
+                                                        <button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button><br /><br />
                                                 <# } else { #>
-                                                        <button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button>
+                                                        <button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button><br /><br />
                                                 <# } #>
-                                        <?php else: ?>
                                                 <button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
                                         <?php endif; ?>
                                 <# } #>
@@ -536 +535 @@
                                 <# if ( ! data.uploading && data.can.remove ) { #>
                                         <?php if ( MEDIA_TRASH ): ?>
                                         <# if ( 'trash' === data.status ) { #>
-                                                <button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button>
+                                                <button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button><br /><br />
                                         <# } else { #>
-                                                <button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button>
+                                                <button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button><br /><br />
                                         <# } #>
-                                        <?php else: ?>
                                                 <button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
                                         <?php endif; ?>
                                 <# } #>