Changeset 12377 for trunk/wp-admin/upload.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/upload.php (modified) (4 diffs)

trunk/wp-admin/upload.php

@@ -244 +244 @@
 }
 $type_links[] = '<li><a href="upload.php?detached=1"' . ( isset($_GET['detached']) ? ' class="current"' : '' ) . '>' . __('Unattached') . '</a>';
-if ( EMPTY_TRASH_DAYS )
+if ( EMPTY_TRASH_DAYS && ( MEDIA_TRASH || !empty($_num_posts['trash']) ) )
     $type_links[] = '<li><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>';
 
@@ -289 +289 @@
 <?php if ( $is_trash ) { ?>
 <option value="untrash"><?php _e('Restore'); ?></option>
-<?php } if ( $is_trash || !EMPTY_TRASH_DAYS ) { ?>
+<?php } if ( $is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) { ?>
 <option value="delete"><?php _e('Delete Permanently'); ?></option>
 <?php } else { ?>
@@ -393 +393 @@
             $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 )
+            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
@@ -455 +455 @@
 <?php if ($is_trash) { ?>
 <option value="untrash"><?php _e('Restore'); ?></option>
-<?php } if ( $is_trash || !EMPTY_TRASH_DAYS ) { ?>
+<?php } if ( $is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) { ?>
 <option value="delete"><?php _e('Delete Permanently'); ?></option>
 <?php } else { ?>