Changeset 12162 for trunk/wp-admin/upload.php

Timestamp:

11/10/2009 10:38:19 AM (17 years ago)

Author:

azaozz

Message:

Remove all instances of "Trash" from the UI when Trash is disabled, replace trash actions with "Delete permanently", props caesarsgrunt, see #4529

File:

• trunk/wp-admin/upload.php (modified) (4 diffs)

trunk/wp-admin/upload.php

@@ -239 +239 @@
 }
 $type_links[] = '<li><a href="upload.php?detached=1"' . ( isset($_GET['detached']) ? ' class="current"' : '' ) . '>' . __('Unattached') . '</a>';
-$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>';
+if ( EMPTY_TRASH_DAYS )
+        $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>';
 
 echo implode( " |</li>\n", $type_links) . '</li>';
@@ -283 +284 @@
 <?php if ( $is_trash ) { ?>
 <option value="untrash"><?php _e('Restore'); ?></option>
+<?php } if ( $is_trash || !EMPTY_TRASH_DAYS ) { ?>
 <option value="delete"><?php _e('Delete Permanently'); ?></option>
 <?php } else { ?>
@@ -386 +388 @@
                         $actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '">' . __('Edit') . '</a>';
                 if ( current_user_can('delete_post', $post->ID) )
-                        $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID) . "'>" . __('Trash') . "</a>";
+                        if ( EMPTY_TRASH_DAYS )
+                                $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID) . "'>" . __('Trash') . "</a>";
+                        else
+                                $actions['delete'] = "<a class='submitdelete' 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>';
                 if ( current_user_can('edit_post', $post->ID) )
@@ -445 +450 @@
 <?php if ($is_trash) { ?>
 <option value="untrash"><?php _e('Restore'); ?></option>
+<?php } if ( $is_trash || !EMPTY_TRASH_DAYS ) { ?>
 <option value="delete"><?php _e('Delete Permanently'); ?></option>
 <?php } else { ?>