X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..16b9f61a8ab25bd6c9fbfd0cea00c7bda22f6a71:/wp-admin/upload.php
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 2b891e13..8ddb013f 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -392,10 +392,12 @@ foreach ($arc_result as $arc_row) {
if ( current_user_can('edit_post', $post->ID) )
$actions['edit'] = '' . __('Edit') . '';
if ( current_user_can('delete_post', $post->ID) )
- if ( EMPTY_TRASH_DAYS && MEDIA_TRASH )
+ if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
$actions['trash'] = "ID) . "'>" . __('Trash') . "";
- else
- $actions['delete'] = "ID) . "'>" . __('Delete Permanently') . "";
+ } else {
+ $delete_ays = !MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
+ $actions['delete'] = "ID) . "'>" . __('Delete Permanently') . "";
+ }
$actions['view'] = '' . __('View') . '';
if ( current_user_can('edit_post', $post->ID) )
$actions['attach'] = ''.__('Attach').'';