Index: wp-admin/edit-attachment-rows.php
===================================================================
--- wp-admin/edit-attachment-rows.php	(revision 12592)
+++ wp-admin/edit-attachment-rows.php	(working copy)
@@ -97,7 +97,7 @@
 			elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH )
 				$actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID) . "'>" . __('Trash') . "</a>";
 			if ( $is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) {
-				$delete_ays = (!$is_trash && !MEDIA_TRASH) ? " onclick='return showNotice.warn();'" : '';
+				$delete_ays = ( !$is_trash && ( !MEDIA_TRASH || !EMPTY_TRASH_DAYS ) ) ? " onclick='return showNotice.warn();'" : '';
 				$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>";
 			}
 		}
Index: wp-admin/upload.php
===================================================================
--- wp-admin/upload.php	(revision 12592)
+++ wp-admin/upload.php	(working copy)
@@ -395,7 +395,7 @@
 			if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
 				$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();'" : '';
+				$delete_ays = ( !MEDIA_TRASH || !EMPTY_TRASH_DAYS ) ? " onclick='return showNotice.warn();'" : '';
 				$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;'), $title)) . '" rel="permalink">' . __('View') . '</a>';