Changeset 12377 for trunk/wp-admin/edit-attachment-rows.php

Timestamp:

12/12/2009 06:40:16 AM (16 years ago)

Author:

azaozz

Message:

Disable trash for attachments for now pending improvements in 3.0, fixes #11149

File:

• trunk/wp-admin/edit-attachment-rows.php (modified) (1 diff)

trunk/wp-admin/edit-attachment-rows.php

@@ -95 +95 @@
             if ( $is_trash )
                 $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 )
+            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 )
+            if ( $is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH )
                 $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "'>" . __('Delete Permanently') . "</a>";
         }