Changeset 12972
- Timestamp:
- 02/05/2010 05:59:18 PM (14 years ago)
- Location:
- trunk/wp-admin
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/edit-attachment-rows.php
r12876 r12972 94 94 if ( current_user_can('delete_post', $post->ID) ) { 95 95 if ( $is_trash ) 96 $actions['untrash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=untrash&post=$post->ID", 'untrash- post_' . $post->ID) . "'>" . __('Restore') . "</a>";96 $actions['untrash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=untrash&post=$post->ID", 'untrash-attachment_' . $post->ID) . "'>" . __('Restore') . "</a>"; 97 97 elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) 98 $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=trash&post=$post->ID", 'trash- post_' . $post->ID) . "'>" . __('Trash') . "</a>";98 $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=trash&post=$post->ID", 'trash-attachment_' . $post->ID) . "'>" . __('Trash') . "</a>"; 99 99 if ( $is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) { 100 100 $delete_ays = (!$is_trash && !MEDIA_TRASH) ? " onclick='return showNotice.warn();'" : ''; 101 $actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url("post.php?action=delete&post=$post->ID", 'delete- post_' . $post->ID) . "'>" . __('Delete Permanently') . "</a>";101 $actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url("post.php?action=delete&post=$post->ID", 'delete-attachment_' . $post->ID) . "'>" . __('Delete Permanently') . "</a>"; 102 102 } 103 103 } -
trunk/wp-admin/includes/media.php
r12955 r12972 1259 1259 if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) { 1260 1260 if ( !EMPTY_TRASH_DAYS ) { 1261 $delete = "<a href='" . wp_nonce_url( "post.php?action=delete&post=$attachment_id", 'delete- post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Delete Permanently' ) . '</a>';1261 $delete = "<a href='" . wp_nonce_url( "post.php?action=delete&post=$attachment_id", 'delete-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Delete Permanently' ) . '</a>'; 1262 1262 } elseif ( !MEDIA_TRASH ) { 1263 1263 $delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a> 1264 1264 <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . " 1265 <a href='" . wp_nonce_url( "post.php?action=delete&post=$attachment_id", 'delete- post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>1265 <a href='" . wp_nonce_url( "post.php?action=delete&post=$attachment_id", 'delete-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a> 1266 1266 <a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a> 1267 1267 </div>"; 1268 1268 } else { 1269 $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&post=$attachment_id", 'trash- post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>1270 <a href='" . wp_nonce_url( "post.php?action=untrash&post=$attachment_id", 'untrash- post_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . "</a>";1269 $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&post=$attachment_id", 'trash-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a> 1270 <a href='" . wp_nonce_url( "post.php?action=untrash&post=$attachment_id", 'untrash-attachment_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . "</a>"; 1271 1271 } 1272 1272 } else { -
trunk/wp-admin/upload.php
r12655 r12972 389 389 if ( current_user_can('delete_post', $post->ID) ) 390 390 if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) { 391 $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=trash&post=$post->ID", 'trash- post_' . $post->ID) . "'>" . __('Trash') . "</a>";391 $actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=trash&post=$post->ID", 'trash-attachment_' . $post->ID) . "'>" . __('Trash') . "</a>"; 392 392 } else { 393 393 $delete_ays = !MEDIA_TRASH ? " onclick='return showNotice.warn();'" : ''; 394 $actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url("post.php?action=delete&post=$post->ID", 'delete- post_' . $post->ID) . "'>" . __('Delete Permanently') . "</a>";394 $actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url("post.php?action=delete&post=$post->ID", 'delete-attachment_' . $post->ID) . "'>" . __('Delete Permanently') . "</a>"; 395 395 } 396 396 $actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . esc_attr(sprintf(__('View “%s”'), $title)) . '" rel="permalink">' . __('View') . '</a>';
Note: See TracChangeset
for help on using the changeset viewer.