Index: wp-app.php =================================================================== --- wp-app.php (revision 11748) +++ wp-app.php (working copy) @@ -1231,7 +1231,7 @@ log_app('Status','204: No Content'); header('Content-Type: text/plain'); status_header('204'); - echo "Deleted."; + echo "Moved to Trash."; exit; } Index: wp-includes/post.php =================================================================== --- wp-includes/post.php (revision 11748) +++ wp-includes/post.php (working copy) @@ -998,7 +998,7 @@ $count = $wpdb->get_results( $wpdb->prepare( $query, $type ), ARRAY_A ); - $stats = array( 'publish' => 0, 'private' => 0, 'draft' => 0, 'pending' => 0, 'future' => 0 ); + $stats = array( 'publish' => 0, 'private' => 0, 'draft' => 0, 'pending' => 0, 'future' => 0, 'trash' => 0 ); foreach( (array) $count as $row_num => $row ) { $stats[$row['post_status']] = $row['num_posts']; } @@ -1027,12 +1027,13 @@ global $wpdb; $and = wp_post_mime_type_where( $mime_type ); - $count = $wpdb->get_results( "SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb->posts WHERE post_type = 'attachment' $and GROUP BY post_mime_type", ARRAY_A ); + $count = $wpdb->get_results( "SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' $and GROUP BY post_mime_type", ARRAY_A ); $stats = array( ); foreach( (array) $count as $row ) { $stats[$row['post_mime_type']] = $row['num_posts']; } + $stats['trash'] = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status = 'trash' $and"); return (object) $stats; } @@ -1140,10 +1141,19 @@ if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) ) return $post; - if ( 'attachment' == $post->post_type ) + if (($post->post_type == 'post' || $post->post_type == 'page') && get_post_status($postid) != 'trash' && EMPTY_TRASH_DAYS > 0) + return wp_trash_post($postid); + + if ($post->post_type == 'attachment') return wp_delete_attachment($postid); do_action('delete_post', $postid); + + $trash_meta = get_option('wp_trash_meta'); + if (is_array($trash_meta) && isset($trash_meta['posts'][$postid])) { + unset($trash_meta['posts'][$postid]); + update_option('wp_trash_meta', $trash_meta); + } /** @todo delete for pluggable post taxonomies too */ wp_delete_object_term_relationships($postid, array('category', 'post_tag')); @@ -1205,6 +1215,72 @@ } /** + * Moves a post or page to the Trash + * + * @since 2.9.0 + * @uses do_action() on 'trash_post' before trashing + * @uses do_action() on 'trashed_post' after trashing + * + * @param int $postid Post ID. + * @return mixed False on failure + */ +function wp_trash_post($postid = 0) { + if (EMPTY_TRASH_DAYS == 0) + return wp_delete_post($postid); + + if (!$post = wp_get_single_post($postid, ARRAY_A)) + return $post; + + do_action('trash_post', $postid); + + $trash_meta = get_option('wp_trash_meta'); + if (!is_array($trash_meta)) + $trash_meta = array(); + $trash_meta['posts'][$postid]['status'] = $post['post_status']; + $trash_meta['posts'][$postid]['time'] = time(); + update_option('wp_trash_meta', $trash_meta); + + $post['post_status'] = 'trash'; + wp_insert_post($post); + + do_action('trashed_post', $postid); + + return $post; +} + +/** + * Removes a post or page from the Trash + * + * @since 2.9.0 + * @uses do_action() on 'untrash_post' before undeletion + * @uses do_action() on 'untrashed_post' after undeletion + * + * @param int $postid Post ID. + * @return mixed False on failure + */ +function wp_untrash_post($postid = 0) { + if (!$post = wp_get_single_post($postid, ARRAY_A)) + return $post; + + do_action('untrash_post', $postid); + + $post['post_status'] = 'draft'; + + $trash_meta = get_option('wp_trash_meta'); + if (is_array($trash_meta) && isset($trash_meta['posts'][$postid])) { + $post['post_status'] = $trash_meta['posts'][$postid]['status']; + unset($trash_meta['posts'][$postid]); + update_option('wp_trash_meta', $trash_meta); + } + + wp_insert_post($post); + + do_action('untrashed_post', $postid); + + return $post; +} + +/** * Retrieve the list of categories for a post. * * Compatibility layer for themes and plugins. Also an easy layer of abstraction @@ -2586,6 +2662,16 @@ if ( 'attachment' != $post->post_type ) return false; + + if (get_post_status($postid) != 'trash') { + return wp_trash_post($postid); + } + + $trash_meta = get_option('wp_trash_meta'); + if (is_array($trash_meta) && isset($trash_meta['posts'][$postid])) { + unset($trash_meta['posts'][$postid]); + update_option('wp_trash_meta', $trash_meta); + } $meta = wp_get_attachment_metadata( $postid ); $file = get_attached_file( $postid ); Index: wp-includes/comment.php =================================================================== --- wp-includes/comment.php (revision 11748) +++ wp-includes/comment.php (working copy) @@ -208,8 +208,8 @@ $approved = "comment_approved = '1'"; elseif ( 'spam' == $status ) $approved = "comment_approved = 'spam'"; - elseif ( 'deleted' == $status ) - $approved = "comment_approved = 'deleted'"; + elseif ( 'trash' == $status ) + $approved = "comment_approved = 'trash'"; else $approved = "( comment_approved = '0' OR comment_approved = '1' )"; @@ -694,14 +694,15 @@ if ( false !== $count ) return $count; - $where = ''; + $where = 'WHERE '; if( $post_id > 0 ) - $where = $wpdb->prepare( "WHERE comment_post_ID = %d", $post_id ); + $where .= $wpdb->prepare( "c.comment_post_ID = %d AND ", $post_id ); + $where .= "p.post_status <> 'trash'"; - $count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A ); + $count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} c LEFT JOIN {$wpdb->posts} p ON c.comment_post_ID = p.ID {$where} GROUP BY comment_approved", ARRAY_A ); $total = 0; - $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'deleted' => 'deleted'); + $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash'); $known_types = array_keys( $approved ); foreach( (array) $count as $row_num => $row ) { $total += $row['num_comments']; @@ -737,16 +738,21 @@ * @return bool False if delete comment query failure, true on success. */ function wp_delete_comment($comment_id) { - if (wp_get_comment_status($comment_id) != 'deleted' && wp_get_comment_status($comment_id) != 'spam') - return wp_set_comment_status($comment_id, 'delete'); + global $wpdb; + if (!$comment = get_comment($comment_id)) + return false; + + if (wp_get_comment_status($comment_id) != 'trash' && wp_get_comment_status($comment_id) != 'spam' && EMPTY_TRASH_DAYS > 0) + return wp_trash_comment($comment_id); - global $wpdb; do_action('delete_comment', $comment_id); - wp_unschedule_comment_delete($comment_id); + $trash_meta = get_option('wp_trash_meta'); + if (is_array($trash_meta) && isset($trash_meta['comments'][$comment_id])) { + unset($trash_meta['comments'][$comment_id]); + update_option('wp_trash_meta', $trash_meta); + } - $comment = get_comment($comment_id); - if ( ! $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment_id) ) ) return false; @@ -769,12 +775,72 @@ } /** + * Moves a comment to the Trash + * + * @since 2.9.0 + * @uses do_action() on 'trash_comment' before trashing + * @uses do_action() on 'trashed_comment' after trashing + * + * @param int $comment_id Comment ID. + * @return mixed False on failure + */ +function wp_trash_comment($comment_id = 0) { + if (EMPTY_TRASH_DAYS == 0) + return wp_delete_comment($comment_id); + + if (!$comment = get_comment($comment_id)) + return false; + + do_action('trash_comment', $comment_id); + + $trash_meta = get_option('wp_trash_meta', array()); + $trash_meta['comments'][$comment_id]['status'] = $comment->comment_approved; + $trash_meta['comments'][$comment_id]['time'] = time(); + update_option('wp_trash_meta', $trash_meta); + + wp_set_comment_status($comment_id, 'trash'); + + do_action('trashed_comment', $comment_id); + + return true; +} + +/** + * Removes a comment from the Trash + * + * @since 2.9.0 + * @uses do_action() on 'untrash_comment' before undeletion + * @uses do_action() on 'untrashed_comment' after undeletion + * + * @param int $comment_id Comment ID. + * @return mixed False on failure + */ +function wp_untrash_comment($comment_id = 0) { + do_action('untrash_comment', $comment_id); + + $comment = array('comment_ID'=>$comment_id, 'comment_approved'=>'0'); + + $trash_meta = get_option('wp_trash_meta'); + if (is_array($trash_meta) && isset($trash_meta['comments'][$comment_id])) { + $comment['comment_approved'] = $trash_meta['comments'][$comment_id]['status']; + unset($trash_meta['comments'][$comment_id]); + update_option('wp_trash_meta', $trash_meta); + } + + wp_update_comment($comment); + + do_action('untrashed_comment', $comment_id); + + return true; +} + +/** * The status of a comment by ID. * * @since 1.0.0 * * @param int $comment_id Comment ID - * @return string|bool Status might be 'deleted', 'approved', 'unapproved', 'spam'. False on failure. + * @return string|bool Status might be 'trash', 'approved', 'unapproved', 'spam'. False on failure. */ function wp_get_comment_status($comment_id) { $comment = get_comment($comment_id); @@ -784,15 +850,15 @@ $approved = $comment->comment_approved; if ( $approved == NULL ) - return 'deleted'; + return false; elseif ( $approved == '1' ) return 'approved'; elseif ( $approved == '0' ) return 'unapproved'; elseif ( $approved == 'spam' ) return 'spam'; - elseif ( $approved == 'deleted' ) - return 'deleted'; + elseif ( $approved == 'trash' ) + return 'trash'; else return false; } @@ -1037,10 +1103,9 @@ */ function wp_set_comment_status($comment_id, $comment_status, $wp_error = false) { global $wpdb; - wp_unschedule_comment_delete($comment_id); - + $status = '0'; - switch ( $comment_status ) { + switch ($comment_status) { case 'hold': $status = '0'; break; @@ -1054,11 +1119,8 @@ case 'spam': $status = 'spam'; break; - case 'delete': - if (wp_get_comment_status($comment_id) == 'deleted' || wp_get_comment_status($comment_id) == 'spam') - return wp_delete_comment($comment_id); - $status = 'deleted'; - wp_schedule_comment_delete($comment_id); + case 'trash': + $status = 'trash'; break; default: return false; @@ -1084,42 +1146,6 @@ } /** - * Schedules a comment for destruction in 30 days. - * - * @since 2.9.0 - * - * @param int $comment_id Comment ID. - * @return void - */ -function wp_schedule_comment_delete($comment_id) { - $to_delete = get_option('wp_scheduled_delete'); - if ( !is_array($to_delete) ) - $to_delete = array(); - - $to_delete['comments'][$comment_id] = time(); - - update_option('wp_scheduled_delete', $to_delete); -} - -/** - * Unschedules a comment for destruction. - * - * @since 2.9.0 - * - * @param int $comment_id Comment ID. - * @return void - */ -function wp_unschedule_comment_delete($comment_id) { - $to_delete = get_option('wp_scheduled_delete'); - if ( !is_array($to_delete) ) - return; - - unset($to_delete['comments'][$comment_id]); - - update_option('wp_scheduled_delete', $to_delete); -} - -/** * Updates an existing comment in the database. * * Filters the comment and makes sure certain fields are valid before updating. Index: wp-includes/functions.php =================================================================== --- wp-includes/functions.php (revision 11748) +++ wp-includes/functions.php (working copy) @@ -3339,30 +3339,31 @@ } /** - * Permanently deletes comments that have been scheduled for deleting. - * Will do the same for posts, pages, etc in the future. + * Permanently deletes posts, pages, attachments, and comments which have been in the trash for EMPTY_TRASH_DAYS. * - * @access private * @since 2.9.0 * * @return void */ function wp_scheduled_delete() { - $to_delete = get_option('wp_scheduled_delete'); - if (!is_array($to_delete)) + $trash_meta = get_option('wp_trash_meta'); + if (!is_array($trash_meta)) return; - if ( !isset($to_delete['comments']) || !is_array($to_delete['comments']) ) - $to_delete['comments'] = array(); - - $delete_delay = defined('EMPTY_TRASH_TIMEOUT') ? (int) EMPTY_TRASH_TIMEOUT : (60*60*24*30); - $deletetimestamp = time() - $delete_delay; - foreach ($to_delete['comments'] as $comment_id => $timestamp) { - if ($timestamp < $deletetimestamp) { - wp_delete_comment($comment_id); - unset($to_delete['comments'][$comment_id]); + $delete_timestamp = time() - (60*60*24*EMPTY_TRASH_DAYS); + + foreach ($trash_meta['comments'] as $id => $meta) { + if ($meta['time'] < $delete_timestamp) { + wp_delete_comment($id); + unset($trash_meta['comments'][$id]); } } + foreach ($trash_meta['posts'] as $id => $meta) { + if ($meta['time'] < $delete_timestamp) { + wp_delete_post($id); + unset($to_delete['posts'][$id]); + } + } update_option('wp_scheduled_delete', $to_delete); } Index: wp-includes/query.php =================================================================== --- wp-includes/query.php (revision 11748) +++ wp-includes/query.php (working copy) @@ -2099,6 +2099,8 @@ $p_status[] = "$wpdb->posts.post_status = 'private'"; if ( in_array( 'publish', $q_status ) ) $r_status[] = "$wpdb->posts.post_status = 'publish'"; + if ( in_array( 'trash', $q_status ) ) + $r_status[] = "$wpdb->posts.post_status = 'trash'"; if ( empty($q['perm'] ) || 'readable' != $q['perm'] ) { $r_status = array_merge($r_status, $p_status); Index: wp-includes/script-loader.php =================================================================== --- wp-includes/script-loader.php (revision 11748) +++ wp-includes/script-loader.php (working copy) @@ -204,7 +204,7 @@ 'upload_stopped' => __('Upload stopped.'), 'dismiss' => __('Dismiss'), 'crunching' => __('Crunching…'), - 'deleted' => __('Deleted'), + 'deleted' => __('Moved to Trash'), 'l10n_print_after' => 'try{convertEntities(swfuploadL10n);}catch(e){};' ) ); Index: wp-settings.php =================================================================== --- wp-settings.php (revision 11748) +++ wp-settings.php (working copy) @@ -534,7 +534,14 @@ if ( !defined( 'AUTOSAVE_INTERVAL' ) ) define( 'AUTOSAVE_INTERVAL', 60 ); +/** + * It is possible to define this in wp-config.php + * @since 2.9.0 + */ +if ( !defined( 'EMPTY_TRASH_DAYS' ) ) + define( 'EMPTY_TRASH_DAYS', 30 ); + require (ABSPATH . WPINC . '/vars.php'); // make taxonomies available to plugins and themes Index: wp-admin/edit-comments.php =================================================================== --- wp-admin/edit-comments.php (revision 11748) +++ wp-admin/edit-comments.php (working copy) @@ -14,20 +14,20 @@ $post_id = isset($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0; -if ( isset($_REQUEST['doaction']) || isset($_REQUEST['doaction2']) || isset($_REQUEST['destroy_all']) || isset($_REQUEST['destroy_all2']) ) { +if ( isset($_REQUEST['doaction']) || isset($_REQUEST['doaction2']) || isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2']) ) { check_admin_referer('bulk-comments'); - if ((isset($_REQUEST['destroy_all']) || isset($_REQUEST['destroy_all2'])) && !empty($_REQUEST['pagegen_timestamp'])) { + if ((isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2'])) && !empty($_REQUEST['pagegen_timestamp'])) { $comment_status = $wpdb->escape($_REQUEST['comment_status']); $delete_time = $wpdb->escape($_REQUEST['pagegen_timestamp']); $comment_ids = $wpdb->get_col( "SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = '$comment_status' AND '$delete_time' > comment_date_gmt" ); - $doaction = 'destroy'; + $doaction = 'delete'; } elseif (($_REQUEST['action'] != -1 || $_REQUEST['action2'] != -1) && isset($_REQUEST['delete_comments'])) { $comment_ids = $_REQUEST['delete_comments']; $doaction = ($_REQUEST['action'] != -1) ? $_REQUEST['action'] : $_REQUEST['action2']; } else wp_redirect($_SERVER['HTTP_REFERER']); - $approved = $unapproved = $spammed = $deleted = $destroyed = 0; + $approved = $unapproved = $spammed = $trashed = $untrashed = $deleted = 0; foreach ($comment_ids as $comment_id) { // Check the permissions on each $_post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment_id) ); @@ -48,18 +48,22 @@ wp_set_comment_status($comment_id, 'spam'); $spammed++; break; + case 'trash' : + wp_trash_comment($comment_id); + $trashed++; + break; + case 'untrash' : + wp_untrash_comment($comment_id); + $untrashed++; + break; case 'delete' : - wp_set_comment_status($comment_id, 'delete'); + wp_delete_comment($comment_id); $deleted++; break; - case 'destroy' : - wp_set_comment_status($comment_id, 'delete'); - $destroyed++; - break; } } - $redirect_to = 'edit-comments.php?approved=' . $approved . '&unapproved=' . $unapproved . '&spam=' . $spammed . '&deleted=' . $deleted . '&destroyed=' . $destroyed; + $redirect_to = 'edit-comments.php?approved=' . $approved . '&unapproved=' . $unapproved . '&spam=' . $spammed . '&trashed=' . $trashed . '&untrashed=' . $untrashed . '&deleted=' . $deleted; if ( $post_id ) $redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to ); if ( isset($_REQUEST['apage']) ) @@ -86,7 +90,7 @@ $mode = ( ! isset($_GET['mode']) || empty($_GET['mode']) ) ? 'detail' : esc_attr($_GET['mode']); $comment_status = isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all'; -if ( !in_array($comment_status, array('all', 'moderated', 'approved', 'spam', 'deleted')) ) +if ( !in_array($comment_status, array('all', 'moderated', 'approved', 'spam', 'trash')) ) $comment_status = 'all'; $comment_type = !empty($_GET['comment_type']) ? esc_attr($_GET['comment_type']) : ''; @@ -102,13 +106,14 @@ 0 || $deleted > 0 || $destroyed > 0 || $spam > 0 ) { + if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spam > 0 ) { echo '

'; if ( $approved > 0 ) { @@ -119,14 +124,18 @@ printf( _n( '%s comment marked as spam', '%s comments marked as spam', $spam ), $spam ); echo '
'; } - if ( $deleted > 0 ) { - printf( _n( '%s comment deleted', '%s comments deleted', $deleted ), $deleted ); + if ( $trashed > 0 ) { + printf( _n( '%s comment moved to the trash', '%s comments moved to the trash', $trashed ), $trashed ); echo '
'; } - if ( $destroyed > 0 ) { - printf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $destroyed ), $destroyed ); + if ( $untrashed > 0 ) { + printf( _n( '%s comment removed from the trash', '%s comments removed from the trash', $untrashed ), $untrashed ); echo '
'; } + if ( $deleted > 0 ) { + printf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $deleted ), $deleted ); + echo '
'; + } echo '

'; } @@ -145,7 +154,7 @@ 'moderated' => _n_noop('Pending (%s)', 'Pending (%s)'), 'approved' => _n_noop('Approved', 'Approved'), // singular not used 'spam' => _n_noop('Spam (%s)', 'Spam (%s)'), - 'deleted' => _n_noop('Trash (%s)', 'Trash (%s)') + 'trash' => _n_noop('Trash (%s)', 'Trash (%s)') ); $link = 'edit-comments.php'; if ( !empty($comment_type) && 'all' != $comment_type ) @@ -256,13 +265,13 @@ - - + + - - + + - + @@ -289,12 +298,12 @@ - - - + + + @@ -352,21 +361,21 @@ - - + + - - + + - + - - - + + + Index: wp-admin/admin-ajax.php =================================================================== --- wp-admin/admin-ajax.php (revision 11748) +++ wp-admin/admin-ajax.php (working copy) @@ -181,18 +181,27 @@ $id = isset($_POST['id'])? (int) $_POST['id'] : 0; switch ( $action = $_POST['action'] ) : case 'delete-comment' : // On success, die with time() instead of 1 - check_ajax_referer( "delete-comment_$id" ); if ( !$comment = get_comment( $id ) ) die( (string) time() ); if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) ) die('-1'); - if ( isset($_POST['spam']) && 1 == $_POST['spam'] ) { + if ( isset($_POST['trash']) && 1 == $_POST['trash'] ) { + check_ajax_referer( "trash-comment_$id" ); + if ( 'trash' == wp_get_comment_status( $comment->comment_ID ) ) + die( (string) time() ); + $r = wp_trash_comment( $comment->comment_ID ); + } elseif ( isset($_POST['untrash']) && 1 == $_POST['untrash'] ) { + check_ajax_referer( "untrash-comment_$id" ); + $r = wp_untrash_comment( $comment->comment_ID ); + } elseif ( isset($_POST['spam']) && 1 == $_POST['spam'] ) { + check_ajax_referer( "delete-comment_$id" ); if ( 'spam' == wp_get_comment_status( $comment->comment_ID ) ) die( (string) time() ); $r = wp_set_comment_status( $comment->comment_ID, 'spam' ); } else { - $r = wp_set_comment_status( $comment->comment_ID, 'delete' ); + check_ajax_referer( "delete-comment_$id" ); + $r = wp_delete_comment( $comment->comment_ID ); } if ( $r ) // Decide if we need to send back '1' or a more complicated response including page links and comment counts _wp_ajax_delete_comment_response( $comment->comment_ID ); Index: wp-admin/wp-admin.css =================================================================== --- wp-admin/wp-admin.css (revision 11748) +++ wp-admin/wp-admin.css (working copy) @@ -409,7 +409,8 @@ } #doaction, -#doaction2 { +#doaction2, +#post-query-submit { margin-right: 8px; } @@ -444,7 +445,7 @@ display: none; } -.unapproved .approve, .spam .approve, .deleted .approve { +.unapproved .approve, .spam .approve, .trash .approve { display: inline; } Index: wp-admin/includes/post.php =================================================================== --- wp-admin/includes/post.php (revision 11748) +++ wp-admin/includes/post.php (working copy) @@ -795,6 +795,7 @@ 'pending' => array(_x('Pending Review', 'post'), __('Pending posts'), _n_noop('Pending Review (%s)', 'Pending Review (%s)')), 'draft' => array(_x('Draft', 'post'), _x('Drafts', 'manage posts header'), _n_noop('Draft (%s)', 'Drafts (%s)')), 'private' => array(_x('Private', 'post'), __('Private posts'), _n_noop('Private (%s)', 'Private (%s)')), + 'trash' => array(_x('Trash', 'post'), __('Trash posts'), _n_noop('Trash (%s)', 'Trash (%s)')), ); $post_stati = apply_filters('post_stati', $post_stati); Index: wp-admin/includes/dashboard.php =================================================================== --- wp-admin/includes/dashboard.php (revision 11748) +++ wp-admin/includes/dashboard.php (working copy) @@ -480,7 +480,7 @@ $comments = array(); $start = 0; - while ( count( $comments ) < 5 && $possible = $wpdb->get_results( "SELECT * FROM $wpdb->comments ORDER BY comment_date_gmt DESC LIMIT $start, 50" ) ) { + while ( count( $comments ) < 5 && $possible = $wpdb->get_results( "SELECT * FROM $wpdb->comments c LEFT JOIN $wpdb->posts p ON c.comment_post_ID = p.ID WHERE p.post_status != 'trash' ORDER BY c.comment_date_gmt DESC LIMIT $start, 50" ) ) { foreach ( $possible as $comment ) { if ( count( $comments ) >= 5 ) Index: wp-admin/includes/template.php =================================================================== --- wp-admin/includes/template.php (revision 11748) +++ wp-admin/includes/template.php (working copy) @@ -1433,24 +1433,29 @@ case 'title': $attributes = 'class="post-title column-title"' . $style; ?> - >ID ) ) { ?> + >ID) && $post->post_status != 'trash' ) { ?> ID) ) { - $actions['edit'] = '' . __('Edit') . ''; - $actions['inline hide-if-no-js'] = '' . __('Quick Edit') . ''; - } - if ( current_user_can('delete_post', $post->ID) ) { - $actions['delete'] = "ID) . "' onclick=\"if ( confirm('" . esc_js(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . ""; - } - if ( in_array($post->post_status, array('pending', 'draft')) ) { - if ( current_user_can('edit_post', $post->ID) ) - $actions['view'] = '' . __('Preview') . ''; + if ( 'trash' == $post->post_status && current_user_can('delete_post', $post->ID) ) { + $actions['untrash'] = "ID) . "'>" . __('Remove from Trash') . ""; + $actions['delete'] = "ID) . "'>" . __('Delete Permanently') . ""; } else { - $actions['view'] = '' . __('View') . ''; + if ( current_user_can('edit_post', $post->ID) ) { + $actions['edit'] = '' . __('Edit') . ''; + $actions['inline hide-if-no-js'] = '' . __('Quick Edit') . ''; + } + if ( current_user_can('delete_post', $post->ID) ) { + $actions['trash'] = "ID) . "'>" . __('Trash') . ""; + } + if ( in_array($post->post_status, array('pending', 'draft')) ) { + if ( current_user_can('edit_post', $post->ID) ) + $actions['view'] = '' . __('Preview') . ''; + } else { + $actions['view'] = '' . __('View') . ''; + } } $actions = apply_filters('post_row_actions', $actions, $post); $action_count = count($actions); @@ -1651,21 +1656,26 @@ $attributes = 'class="post-title page-title column-title"' . $style; $edit_link = get_edit_post_link( $page->ID ); ?> - >ID ) ) { ?> + >ID) && $post->post_status != 'trash' ) { ?> ID) ) { - $actions['edit'] = '' . __('Edit') . ''; - $actions['inline'] = '' . __('Quick Edit') . ''; - } - if ( current_user_can('delete_page', $page->ID) ) { - $actions['delete'] = "ID) . "' onclick=\"if ( confirm('" . esc_js(sprintf( ('draft' == $page->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $page->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . ""; - } - if ( in_array($post->post_status, array('pending', 'draft')) ) { - if ( current_user_can('edit_page', $page->ID) ) - $actions['view'] = '' . __('Preview') . ''; + if ($post->post_status == 'trash' && current_user_can('delete_page', $page->ID)) { + $actions['untrash'] = "ID) . "'>" . __('Remove from Trash') . ""; + $actions['delete'] = "ID) . "'>" . __('Delete Permanently') . ""; } else { - $actions['view'] = '' . __('View') . ''; + if ( current_user_can('edit_page', $page->ID) ) { + $actions['edit'] = '' . __('Edit') . ''; + $actions['inline'] = '' . __('Quick Edit') . ''; + } + if ( current_user_can('delete_page', $page->ID) ) { + $actions['trash'] = "ID) . "'>" . __('Trash') . ""; + } + if ( in_array($post->post_status, array('pending', 'draft')) ) { + if ( current_user_can('edit_page', $page->ID) ) + $actions['view'] = '' . __('Preview') . ''; + } else { + $actions['view'] = '' . __('View') . ''; + } } $actions = apply_filters('page_row_actions', $actions, $page); $action_count = count($actions); @@ -1981,7 +1991,7 @@ * * @since unknown * - * @param string $status Comment status (approved, spam, deleted, etc) + * @param string $status Comment status (approved, spam, trash, etc) * @param string $s Term to search for * @param int $start Offset to start at for pagination * @param int $num Maximum number of comments to return @@ -1999,62 +2009,63 @@ $index = ''; if ( 'moderated' == $status ) { - $approved = "comment_approved = '0'"; + $approved = "c.comment_approved = '0'"; $total = $count->moderated; } elseif ( 'approved' == $status ) { - $approved = "comment_approved = '1'"; + $approved = "c.comment_approved = '1'"; $total = $count->approved; } elseif ( 'spam' == $status ) { - $approved = "comment_approved = 'spam'"; + $approved = "c.comment_approved = 'spam'"; $total = $count->spam; - } elseif ( 'deleted' == $status ) { - $approved = "comment_approved = 'deleted'"; - $total = $count->deleted; + } elseif ( 'trash' == $status ) { + $approved = "c.comment_approved = 'trash'"; + $total = $count->trash; } else { - $approved = "( comment_approved = '0' OR comment_approved = '1' )"; + $approved = "( c.comment_approved = '0' OR c.comment_approved = '1' )"; $total = $count->moderated + $count->approved; - $index = 'USE INDEX (comment_date_gmt)'; + $index = 'USE INDEX (c.comment_date_gmt)'; } if ( $post ) { $total = ''; - $post = " AND comment_post_ID = '$post'"; - $orderby = "ORDER BY comment_date_gmt ASC LIMIT $start, $num"; + $post = " AND c.comment_post_ID = '$post'"; + $orderby = "ORDER BY c.comment_date_gmt ASC LIMIT $start, $num"; } else { $post = ''; - $orderby = "ORDER BY comment_date_gmt DESC LIMIT $start, $num"; + $orderby = "ORDER BY c.comment_date_gmt DESC LIMIT $start, $num"; } if ( 'comment' == $type ) - $typesql = "AND comment_type = ''"; + $typesql = "AND c.comment_type = ''"; elseif ( 'pings' == $type ) - $typesql = "AND ( comment_type = 'pingback' OR comment_type = 'trackback' )"; + $typesql = "AND ( c.comment_type = 'pingback' OR c.comment_type = 'trackback' )"; elseif ( !empty($type) ) - $typesql = $wpdb->prepare("AND comment_type = %s", $type); + $typesql = $wpdb->prepare("AND c.comment_type = %s", $type); else $typesql = ''; if ( !empty($type) ) $total = ''; + $query = "FROM $wpdb->comments c LEFT JOIN $wpdb->posts p ON c.comment_post_ID = p.ID WHERE p.post_status != 'trash' "; if ( $s ) { $total = ''; $s = $wpdb->escape($s); - $query = "FROM $wpdb->comments WHERE - (comment_author LIKE '%$s%' OR - comment_author_email LIKE '%$s%' OR - comment_author_url LIKE ('%$s%') OR - comment_author_IP LIKE ('%$s%') OR - comment_content LIKE ('%$s%') ) AND + $query .= "AND + (c.comment_author LIKE '%$s%' OR + c.comment_author_email LIKE '%$s%' OR + c.comment_author_url LIKE ('%$s%') OR + c.comment_author_IP LIKE ('%$s%') OR + c.comment_content LIKE ('%$s%') ) AND $approved $typesql"; } else { - $query = "FROM $wpdb->comments $index WHERE $approved $post $typesql"; + $query .= "AND $approved $post $typesql"; } - + $comments = $wpdb->get_results("SELECT * $query $orderby"); if ( '' === $total ) - $total = $wpdb->get_var("SELECT COUNT(comment_ID) $query"); + $total = $wpdb->get_var("SELECT COUNT(c.comment_ID) $query"); update_comment_cache($comments); @@ -2095,6 +2106,8 @@ $approve_url = esc_url( wp_nonce_url( "comment.php?action=approvecomment&p=$post->ID&c=$comment->comment_ID", "approve-comment_$comment->comment_ID" ) ); $unapprove_url = esc_url( wp_nonce_url( "comment.php?action=unapprovecomment&p=$post->ID&c=$comment->comment_ID", "unapprove-comment_$comment->comment_ID" ) ); $spam_url = esc_url( wp_nonce_url( "comment.php?action=deletecomment&dt=spam&p=$post->ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) ); + $trash_url = esc_url( wp_nonce_url( "comment.php?action=trashcomment&p=$post->ID&c=$comment->comment_ID", "trash-comment_$comment->comment_ID" ) ); + $untrash_url = esc_url( wp_nonce_url( "comment.php?action=untrashcomment&p=$post->ID&c=$comment->comment_ID", "untrash-comment_$comment->comment_ID" ) ); echo ""; $columns = get_column_headers('edit-comments'); @@ -2134,9 +2147,9 @@ $actions = array(); if ( $user_can ) { - if ( 'deleted' == $the_comment_status ) { - $actions['unapprove'] = "" . __( 'Return to Pending' ) . ''; - $actions['delete'] = "" . __('Delete Permanently') . ''; + if ( 'trash' == $the_comment_status ) { + $actions['untrash'] = "" . __( 'Remove from Trash' ) . ''; + $actions['delete'] = "" . __('Delete Permanently') . ''; } else { $actions['approve'] = "" . __( 'Approve' ) . ''; $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; @@ -2152,10 +2165,10 @@ } if ( 'spam' == $the_comment_status ) { - $actions['delete'] = "" . __('Delete Permanently') . ''; + $actions['delete'] = "" . __('Delete Permanently') . ''; } else { $actions['spam'] = "" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . ''; - $actions['delete'] = "" . __('Move to Trash') . ''; + $actions['trash'] = "" . __('Trash') . ''; } $actions['edit'] = "". __('Edit') . ''; @@ -2176,6 +2189,15 @@ // Reply and quickedit need a hide-if-no-js span when not added with ajax if ( ('reply' == $action || 'quickedit' == $action) && ! $from_ajax ) $action .= ' hide-if-no-js'; + elseif ($action == 'untrash' && $the_comment_status == 'trash') { + $trash_meta = get_option('wp_trash_meta'); + if (is_array($trash_meta) && isset($trash_meta['comments'][$comment_id]['status'])) { + if ($trash_meta['comments'][$comment_id]['status'] == '1') + $action .= ' approve'; + else + $action .= ' unapprove'; + } + } echo "$sep$link"; } Index: wp-admin/includes/media.php =================================================================== --- wp-admin/includes/media.php (revision 11748) +++ wp-admin/includes/media.php (working copy) @@ -1166,15 +1166,13 @@ 'extra_rows' => array(), ); - $delete_href = wp_nonce_url("post.php?action=delete-post&post=$attachment_id", 'delete-post_' . $attachment_id); + $delete_href = wp_nonce_url("post.php?action=trash&post=$attachment_id", 'delete-post_' . $attachment_id); if ( $send ) $send = ""; if ( $delete ) - $delete = "" . __('Delete') . ""; + $delete = "" . __('Move to Trash') . ""; if ( ( $send || $delete ) && !isset($form_fields['buttons']) ) - $form_fields['buttons'] = array('tr' => "\t\t$send $delete -
" . sprintf(__("You are about to delete %s."), $filename) . " " . __('Continue') . " - " . __('Cancel') . "
\n"); + $form_fields['buttons'] = array('tr' => "\t\t$send $delete\n"); $hidden_fields = array(); Index: wp-admin/post.php =================================================================== --- wp-admin/post.php (revision 11748) +++ wp-admin/post.php (working copy) @@ -116,6 +116,7 @@ $post = get_post($post_ID); if ( empty($post->ID) ) wp_die( __('You attempted to edit a post that doesn’t exist. Perhaps it was deleted?') ); + if ( $post->post_status == 'trash' ) wp_die( __('You can’t edit this post because it is in the Trash. Please move it out of the Trash and try again.') ); if ( 'post' != $post->post_type ) { wp_redirect( get_edit_post_link( $post->ID, 'url' ) ); @@ -181,6 +182,46 @@ exit(); break; +case 'trash': + $post_id = (isset($_GET['post'])) ? intval($_GET['post']) : intval($_POST['post_ID']); + check_admin_referer('trash-post_' . $post_id); + + $post = & get_post($post_id); + + if ( !current_user_can('delete_post', $post_id) ) + wp_die( __('You are not allowed to move this post to the trash.') ); + + if ( ! wp_trash_post($post_id) ) + wp_die( __('Error in moving to trash...') ); + + $sendback = wp_get_referer(); + if (strpos($sendback, 'post.php') !== false) $sendback = admin_url('edit.php?trashed=1'); + elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php'); + else $sendback = add_query_arg('trashed', 1, $sendback); + wp_redirect($sendback); + exit(); + break; + +case 'untrash': + $post_id = (isset($_GET['post'])) ? intval($_GET['post']) : intval($_POST['post_ID']); + check_admin_referer('untrash-post_' . $post_id); + + $post = & get_post($post_id); + + if ( !current_user_can('delete_post', $post_id) ) + wp_die( __('You are not allowed to remove this post from the trash.') ); + + if ( ! wp_untrash_post($post_id) ) + wp_die( __('Error in removing from trash...') ); + + $sendback = wp_get_referer(); + if (strpos($sendback, 'post.php') !== false) $sendback = admin_url('edit.php?untrashed=1'); + elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php'); + else $sendback = add_query_arg('untrashed', 1, $sendback); + wp_redirect($sendback); + exit(); + break; + case 'delete': $post_id = (isset($_GET['post'])) ? intval($_GET['post']) : intval($_POST['post_ID']); check_admin_referer('delete-post_' . $post_id); Index: wp-admin/js/common.dev.js =================================================================== --- wp-admin/js/common.dev.js (revision 11748) +++ wp-admin/js/common.dev.js (working copy) @@ -154,16 +154,6 @@ $('div.wrap h2 ~ div.updated, div.wrap h2 ~ div.error').addClass('below-h2'); $('div.updated, div.error').not('.below-h2').insertAfter('div.wrap h2:first'); - // show warnings - $('#doaction, #doaction2').click(function(){ - if ( $('select[name="action"]').val() == 'destroy' || $('select[name="action2"]').val() == 'destroy' ) { - return showNotice.warn(); - } - }); - $('#destroy_all, #destroy_all2').click(function(){ - return showNotice.warn(); - }); - // screen settings tab $('#show-settings-link').click(function () { if ( ! $('#screen-options-wrap').hasClass('screen-options-open') ) { Index: wp-admin/js/edit-comments.dev.js =================================================================== --- wp-admin/js/edit-comments.dev.js (revision 11748) +++ wp-admin/js/edit-comments.dev.js (working copy) @@ -38,9 +38,6 @@ settings.data._page = pageInput.val(); settings.data._url = document.location.href; - if ( 'undefined' != showNotice && settings.data.action && settings.data.action == 'delete-comment' && settings.data.deleted) - return showNotice.warn() ? settings : false; - return settings; }; @@ -101,17 +98,15 @@ a.html(n); }); - $('span.deleted-count').each( function() { + $('span.trash-count').each( function() { var a = $(this), n; n = a.html().replace(/[ ,.]+/g, ''); n = parseInt(n,10); if ( isNaN(n) ) return; - if ( $(settings.target).parents( 'span.delete' ).size() && $('#' + settings.element).is('.deleted,.spam') ) { // we destroyed a deleted or spam comment - n--; - } else if ( $(settings.target).parents( 'span.delete' ).size() ) { // we deleted a comment - n++; - } else if ( $('#' + settings.element).is('.deleted') ) { // we approved or spammed a deleted comment - n--; + if ( $(settings.target).parents( 'span.trash' ).size() ) { // we trashed a comment + n = n + 1; + } else if ( $('#' + settings.element).is('.trash') ) { // we deleted or untrashed a trash comment + n = n - 1; } if ( n < 0 ) { n = 0; } n = n.toString(); Index: wp-admin/edit-page-form.php =================================================================== --- wp-admin/edit-page-form.php (revision 11748) +++ wp-admin/edit-page-form.php (working copy) @@ -216,7 +216,7 @@
ID) ) { ?> -ID", 'delete-page_' . $post->ID); ?>" onclick="if ( confirm('post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )); ?>') ) {return true;}return false;"> +ID", 'trash-page_' . $post->ID); ?>">
Index: wp-admin/comment.php =================================================================== --- wp-admin/comment.php (revision 11748) +++ wp-admin/comment.php (working copy) @@ -44,8 +44,8 @@ if ( !current_user_can('edit_post', $comment->comment_post_ID) ) comment_footer_die( __('You are not allowed to edit comments on this post.') ); - if ( 'deleted' == $comment->comment_status ) - comment_footer_die( __('This comment has been deleted. Please move it out of the Trash if you want to edit it.') ); + if ( 'trash' == $comment->comment_status ) + comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') ); $comment = get_comment_to_edit( $comment_id ); @@ -166,6 +166,35 @@ die; break; +case 'trashcomment' : +case 'untrashcomment' : + $comment_id = absint( $_REQUEST['c'] ); + $noredir = isset($_REQUEST['noredir']); + + if (!$comment = get_comment($comment_id)) + comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' '.__('Go back').'!', 'edit-comments.php') ); + if (!current_user_can('edit_post', $comment->comment_post_ID )) + comment_footer_die( __('You are not allowed to edit comments on this post.') ); + + if ($action == 'trashcomment') { + check_admin_referer( 'trash-comment_' . $comment_id ); + wp_trash_comment($comment_id); + } + else { + check_admin_referer( 'untrash-comment_' . $comment_id ); + wp_untrash_comment($comment_id); + } + + if ('' != wp_get_referer() && false == $noredir && false === strpos(wp_get_referer(), 'comment.php' )) + wp_redirect( wp_get_referer() ); + else if ('' != wp_get_original_referer() && false == $noredir) + wp_redirect(wp_get_original_referer()); + else + wp_redirect(admin_url('edit-comments.php')); + + die; + break; + case 'unapprovecomment' : $comment_id = absint( $_GET['c'] ); check_admin_referer( 'unapprove-comment_' . $comment_id ); Index: wp-admin/edit-attachment-rows.php =================================================================== --- wp-admin/edit-attachment-rows.php (revision 11748) +++ wp-admin/edit-attachment-rows.php (working copy) @@ -29,6 +29,8 @@ $posts_columns = get_column_headers('upload'); $hidden = get_hidden_columns('upload'); while (have_posts()) : the_post(); +if ($is_trash && $post->post_status != 'trash') continue; +elseif (!$is_trash && $post->post_status == 'trash') continue; $alt = ( 'alternate' == $alt ) ? '' : 'alternate'; global $current_user; $post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' ); @@ -60,13 +62,15 @@ ?> >ID, array(80, 60), true ) ) { + if ($is_trash) echo $thumb; + else { ?> - - >
+ >
ID))); ?>

ID) ) - $actions['edit'] = '' . __('Edit') . ''; - if ( current_user_can('delete_post', $post->ID) ) - $actions['delete'] = "ID) . "' onclick=\"if ( confirm('" . esc_js(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this attachment '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this attachment '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . ""; - $actions['view'] = '' . __('View') . ''; + if ($is_trash && current_user_can('delete_post', $post->ID)) { + $actions['untrash'] = "ID) . "'>" . __('Remove from Trash') . ""; + $actions['delete'] = "ID) . "'>" . __('Delete Permanently') . ""; + } else { + if (current_user_can('edit_post', $post->ID)) + $actions['edit'] = '' . __('Edit') . ''; + if (current_user_can('delete_post', $post->ID)) + $actions['trash'] = "ID) . "'>" . __('Trash') . ""; + $actions['view'] = '' . __('View') . ''; + } $action_count = count($actions); $i = 0; echo '

'; Index: wp-admin/media.php =================================================================== --- wp-admin/media.php (revision 11748) +++ wp-admin/media.php (working copy) @@ -58,6 +58,9 @@ $att = get_post($att_id); + if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?') ); + if ( $att->post_status == 'trash' ) wp_die( __('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') ); + add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2); wp_enqueue_script( 'wp-ajax-response' ); Index: wp-admin/upload.php =================================================================== --- wp-admin/upload.php (revision 11748) +++ wp-admin/upload.php (working copy) @@ -67,33 +67,59 @@ exit; } -} elseif ( isset($_GET['action']) && isset($_GET['media']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] ) ) { +} elseif ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) { check_admin_referer('bulk-media'); - $doaction = ( -1 != $_GET['action'] ) ? $_GET['action'] : $_GET['action2']; + + if (isset($_GET['delete_all']) || isset($_GET['delete_all2'])) { + $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'" ); + $doaction = 'delete'; + } elseif (($_GET['action'] != -1 || $_GET['action2'] != -1) && isset($_GET['media'])) { + $post_ids = $_GET['media']; + $doaction = ($_GET['action'] != -1) ? $_GET['action'] : $_GET['action2']; + } else wp_redirect($_SERVER['HTTP_REFERER']); + + $location = 'upload.php'; + if ( $referer = wp_get_referer() ) { + if ( false !== strpos($referer, 'upload.php') ) + $location = $referer; + } - if ( 'delete' == $doaction ) { - foreach( (array) $_GET['media'] as $post_id_del ) { - $post_del = & get_post($post_id_del); - - if ( !current_user_can('delete_post', $post_id_del) ) - wp_die( __('You are not allowed to delete this post.') ); - - if ( $post_del->post_type == 'attachment' ) - if ( ! wp_delete_attachment($post_id_del) ) + switch ( $doaction ) { + case 'trash': + foreach( (array) $post_ids as $post_id ) { + if ( !current_user_can('delete_post', $post_id) ) + wp_die( __('You are not allowed to move this post to the trash.') ); + + if ( !wp_trash_post($post_id) ) + wp_die( __('Error in moving to trash...') ); + } + $location = add_query_arg('message', 4, $location); + break; + case 'untrash': + foreach( (array) $post_ids as $post_id ) { + if ( !current_user_can('delete_post', $post_id) ) + wp_die( __('You are not allowed to remove this post from the trash.') ); + + if ( !wp_untrash_post($post_id) ) + wp_die( __('Error in removing from trash...') ); + } + $location = add_query_arg('message', 5, $location); + break; + case 'delete': + foreach( (array) $post_ids as $post_id_del ) { + if ( !current_user_can('delete_post', $post_id_del) ) + wp_die( __('You are not allowed to delete this post.') ); + + if ( !wp_delete_attachment($post_id_del) ) wp_die( __('Error in deleting...') ); - } + } + $location = add_query_arg('message', 2, $location); + break; + } - $location = 'upload.php'; - if ( $referer = wp_get_referer() ) { - if ( false !== strpos($referer, 'upload.php') ) - $location = $referer; - } - - $location = add_query_arg('message', 2, $location); - $location = remove_query_arg('posted', $location); - wp_redirect($location); - exit; - } + $location = remove_query_arg('posted', $location); + wp_redirect($location); + exit; } elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; @@ -115,7 +141,7 @@ $orphans = $wpdb->get_results( "SELECT * FROM $wpdb->posts WHERE post_type = 'attachment' AND ID IN ($lost) LIMIT $start, 50" ); } else { $start = ( $_GET['paged'] - 1 ) * 25; - $orphans = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent < 1 LIMIT $start, 25" ); + $orphans = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1 LIMIT $start, 25" ); $page_links_total = ceil($wpdb->get_var( "SELECT FOUND_ROWS()" ) / 25); } @@ -135,6 +161,8 @@ list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query(); } +$is_trash = (isset($_GET['status']) && $_GET['status'] == 'trash'); + wp_enqueue_script('media'); require_once('admin-header.php'); ?> @@ -153,6 +181,8 @@ $messages[1] = __('Media attachment updated.'); $messages[2] = __('Media deleted.'); $messages[3] = __('Error saving media attachment.'); +$messages[4] = __('Media moved to Trash.'); +$messages[5] = __('Media removed from Trash.'); if ( isset($_GET['message']) && (int) $_GET['message'] ) { $message = $messages[$_GET['message']]; @@ -180,13 +210,13 @@ $reals ) foreach ( $reals as $real ) $num_posts[$type] = ( isset( $num_posts[$type] ) ) ? $num_posts[$type] + $_num_posts[$real] : $_num_posts[$real]; -$class = empty($_GET['post_mime_type']) && ! isset($_GET['detached']) ? ' class="current"' : ''; +$class = (empty($_GET['post_mime_type']) && !isset($_GET['detached']) && !isset($_GET['status'])) ? ' class="current"' : ''; $type_links[] = "
  • " . sprintf( _nx( 'All (%s)', 'All (%s)', $_total_posts, 'uploaded files' ), number_format_i18n( $_total_posts ) ) . ''; foreach ( $post_mime_types as $mime_type => $label ) { $class = ''; @@ -199,8 +229,8 @@ $type_links[] = "
  • " . sprintf( _n( $label[2][0], $label[2][1], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . ''; } -$class = isset($_GET['detached']) ? ' class="current"' : ''; -$type_links[] = '
  • ' . __('Unattached') . ''; +$type_links[] = '
  • ' . __('Unattached') . ''; +$type_links[] = '
  • ' . sprintf( _nx( 'Trash (%s)', 'Trash (%s)', $_num_posts['trash'], 'uploaded files' ), number_format_i18n( $_num_posts['trash'] ) ) . ''; echo implode( " |
    • \n", $type_links) . ''; unset($type_links); @@ -242,8 +272,12 @@
    @@ -251,7 +285,7 @@ posts WHERE post_type = 'attachment' ORDER BY post_date DESC"; $arc_result = $wpdb->get_results( $arc_query ); @@ -286,6 +320,8 @@ + +
    @@ -341,7 +377,7 @@ if ( current_user_can('edit_post', $post->ID) ) $actions['edit'] = '' . __('Edit') . ''; if ( current_user_can('delete_post', $post->ID) ) - $actions['delete'] = "ID) . "' onclick=\"if ( confirm('" . esc_js(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this attachment '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this attachment '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . ""; + $actions['trash'] = "ID) . "'>" . __('Trash') . ""; $actions['view'] = '' . __('View') . ''; if ( current_user_can('edit_post', $post->ID) ) $actions['attach'] = ''.__('Attach').''; @@ -398,12 +434,20 @@
    + + + +

    Index: wp-admin/edit-form-comment.php =================================================================== --- wp-admin/edit-form-comment.php (revision 11748) +++ wp-admin/edit-form-comment.php (working copy) @@ -64,7 +64,7 @@
    -comment_ID&_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . esc_js(__("You are about to delete this comment. \n 'Cancel' to stop, 'OK' to delete.")) . "') ){return true;}return false;\">" . __('Delete') . "\n"; ?> +comment_ID&_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "'>" . __('Move to Trash') . "\n"; ?>
    Index: wp-admin/edit-form-advanced.php =================================================================== --- wp-admin/edit-form-advanced.php (revision 11748) +++ wp-admin/edit-form-advanced.php (working copy) @@ -229,7 +229,7 @@ Index: wp-admin/edit.php =================================================================== --- wp-admin/edit.php (revision 11748) +++ wp-admin/edit.php (working copy) @@ -18,45 +18,75 @@ } // Handle bulk actions -if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] ) ) { - $doaction = ( -1 != $_GET['action'] ) ? $_GET['action'] : $_GET['action2']; - +if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) { + check_admin_referer('bulk-posts'); + + if (isset($_GET['delete_all']) || isset($_GET['delete_all2'])) { + $post_status = $wpdb->escape($_GET['post_status']); + $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='post' AND post_status = '$post_status'" ); + $doaction = 'delete'; + } elseif (($_GET['action'] != -1 || $_GET['action2'] != -1) && isset($_GET['post'])) { + $post_ids = $_GET['post']; + $doaction = ($_GET['action'] != -1) ? $_GET['action'] : $_GET['action2']; + } else wp_redirect($_SERVER['HTTP_REFERER']); + switch ( $doaction ) { - case 'delete': - if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) { - check_admin_referer('bulk-posts'); - $deleted = 0; - foreach( (array) $_GET['post'] as $post_id_del ) { - $post_del = & get_post($post_id_del); + case 'trash': + $trashed = 0; + foreach( (array) $post_ids as $post_id ) { + $post_del = & get_post($post_id); - if ( !current_user_can('delete_post', $post_id_del) ) - wp_die( __('You are not allowed to delete this post.') ); + if ( !current_user_can('delete_post', $post_id_del) ) + wp_die( __('You are not allowed to move this post to the trash.') ); - if ( $post_del->post_type == 'attachment' ) { - if ( ! wp_delete_attachment($post_id_del) ) - wp_die( __('Error in deleting...') ); - } else { - if ( !wp_delete_post($post_id_del) ) - wp_die( __('Error in deleting...') ); - } - $deleted++; - } + if ( !wp_trash_post($post_id) ) + wp_die( __('Error in moving to trash...') ); + + $trashed++; } break; - case 'edit': - if ( isset($_GET['post']) && isset($_GET['bulk_edit']) ) { - check_admin_referer('bulk-posts'); + case 'untrash': + $untrashed = 0; + foreach( (array) $post_ids as $post_id ) { + $post_del = & get_post($post_id); - if ( -1 == $_GET['_status'] ) { - $_GET['post_status'] = null; - unset($_GET['_status'], $_GET['post_status']); + if ( !current_user_can('delete_post', $post_id_del) ) + wp_die( __('You are not allowed to remove this post from the trash.') ); + + if ( !wp_untrash_post($post_id) ) + wp_die( __('Error in removing from trash...') ); + + $untrashed++; + } + break; + case 'delete': + $deleted = 0; + foreach( (array) $post_ids as $post_id_del ) { + $post_del = & get_post($post_id_del); + + if ( !current_user_can('delete_post', $post_id_del) ) + wp_die( __('You are not allowed to delete this post.') ); + + if ( $post_del->post_type == 'attachment' ) { + if ( ! wp_delete_attachment($post_id_del) ) + wp_die( __('Error in deleting...') ); } else { - $_GET['post_status'] = $_GET['_status']; + if ( !wp_delete_post($post_id_del) ) + wp_die( __('Error in deleting...') ); } - - $done = bulk_edit_posts($_GET); + $deleted++; } break; + case 'edit': + if ( -1 == $_GET['_status'] ) { + $_GET['post_status'] = null; + unset($_GET['_status'], $_GET['post_status']); + } else { + $_GET['post_status'] = $_GET['_status']; + } + + $done = bulk_edit_posts($_GET); + break; } $sendback = wp_get_referer(); @@ -68,8 +98,12 @@ $done['locked'] = count( $done['locked'] ); $sendback = add_query_arg( $done, $sendback ); } - if ( isset($deleted) ) + if (isset($deleted)) $sendback = add_query_arg('deleted', $deleted, $sendback); + elseif (isset($trashed)) + $sendback = add_query_arg('trashed', $trashed, $sendback); + elseif (isset($untrashed)) + $sendback = add_query_arg('untrashed', $untrashed, $sendback); wp_redirect($sendback); exit(); } elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { @@ -107,7 +141,7 @@ - +

    @@ -139,7 +183,7 @@ if ( empty($locked_post_status) ) : $status_links = array(); $num_posts = wp_count_posts( 'post', 'readable' ); -$total_posts = array_sum( (array) $num_posts ); +$total_posts = array_sum( (array) $num_posts ) - $num_posts->trash; $class = empty( $_GET['post_status'] ) ? ' class="current"' : ''; $status_links[] = "
  • " . sprintf( _nx( 'All (%s)', 'All (%s)', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . ''; @@ -190,8 +234,13 @@
    @@ -235,7 +284,8 @@ do_action('restrict_manage_posts'); ?> - + +
    @@ -270,10 +320,18 @@
    + + +

    Index: wp-admin/page.php =================================================================== --- wp-admin/page.php (revision 11748) +++ wp-admin/page.php (working copy) @@ -83,6 +83,7 @@ $post = get_post_to_edit($page_ID); if ( empty($post->ID) ) wp_die( __('You attempted to edit a page that doesn’t exist. Perhaps it was deleted?') ); + if ( $post->post_status == 'trash' ) wp_die( __('You can’t edit this page because it is in the Trash. Please move it out of the Trash and try again.') ); if ( 'page' != $post->post_type ) { wp_redirect( get_edit_post_link( $post_ID, 'url' ) ); @@ -140,6 +141,46 @@ exit(); break; +case 'trash': + $post_id = (isset($_GET['post'])) ? intval($_GET['post']) : intval($_POST['post_ID']); + check_admin_referer('trash-page_' . $post_id); + + $post = & get_post($post_id); + + if ( !current_user_can('delete_page', $page_id) ) + wp_die( __('You are not allowed to move this page to the trash.') ); + + if ( !wp_trash_post($post_id) ) + wp_die( __('Error in removing from trash...') ); + + $sendback = wp_get_referer(); + if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('edit-pages.php?trashed=1'); + elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php'); + else $sendback = add_query_arg('trashed', 1, $sendback); + wp_redirect($sendback); + exit(); + break; + +case 'untrash': + $post_id = (isset($_GET['post'])) ? intval($_GET['post']) : intval($_POST['post_ID']); + check_admin_referer('untrash-page_' . $post_id); + + $post = & get_post($post_id); + + if ( !current_user_can('delete_page', $page_id) ) + wp_die( __('You are not allowed to remove this page form the trash.') ); + + if ( !wp_untrash_post($post_id) ) + wp_die( __('Error in removing from trash...') ); + + $sendback = wp_get_referer(); + if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('edit-pages.php?untrashed=1'); + elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php'); + else $sendback = add_query_arg('untrashed', 1, $sendback); + wp_redirect($sendback); + exit(); + break; + case 'delete': $page_id = (isset($_GET['post'])) ? intval($_GET['post']) : intval($_POST['post_ID']); check_admin_referer('delete-page_' . $page_id); Index: wp-admin/edit-pages.php =================================================================== --- wp-admin/edit-pages.php (revision 11748) +++ wp-admin/edit-pages.php (working copy) @@ -10,45 +10,71 @@ require_once('admin.php'); // Handle bulk actions -if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] ) ) { - $doaction = ( -1 != $_GET['action'] ) ? $_GET['action'] : $_GET['action2']; +if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) { + check_admin_referer('bulk-pages'); + + if (isset($_GET['delete_all']) || isset($_GET['delete_all2'])) { + $post_status = $wpdb->escape($_GET['post_status']); + $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = '$post_status'" ); + $doaction = 'delete'; + } elseif (($_GET['action'] != -1 || $_GET['action2'] != -1) && isset($_GET['post'])) { + $post_ids = $_GET['post']; + $doaction = ($_GET['action'] != -1) ? $_GET['action'] : $_GET['action2']; + } else wp_redirect($_SERVER['HTTP_REFERER']); switch ( $doaction ) { - case 'delete': - if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) { - check_admin_referer('bulk-pages'); - $deleted = 0; - foreach( (array) $_GET['post'] as $post_id_del ) { - $post_del = & get_post($post_id_del); + case 'trash': + $trashed = 0; + foreach( (array) $post_ids as $post_id ) { + if ( !current_user_can('delete_page', $post_id) ) + wp_die( __('You are not allowed to move this page to the trash.') ); - if ( !current_user_can('delete_page', $post_id_del) ) - wp_die( __('You are not allowed to delete this page.') ); + if ( !wp_trash_post($post_id) ) + wp_die( __('Error in moving to trash...') ); + + $trashed++; + } + break; + case 'untrash': + $untrashed = 0; + foreach( (array) $post_ids as $post_id ) { + if ( !current_user_can('delete_page', $post_id) ) + wp_die( __('You are not allowed to remove this page from the trash.') ); - if ( $post_del->post_type == 'attachment' ) { - if ( ! wp_delete_attachment($post_id_del) ) - wp_die( __('Error in deleting...') ); - } else { - if ( !wp_delete_post($post_id_del) ) - wp_die( __('Error in deleting...') ); - } - $deleted++; - } + if ( !wp_untrash_post($post_id) ) + wp_die( __('Error in removing from trash...') ); + + $untrashed++; } break; - case 'edit': - if ( isset($_GET['post']) && isset($_GET['bulk_edit']) ) { - check_admin_referer('bulk-pages'); + case 'delete': + $deleted = 0; + foreach( (array) $post_ids as $post_id_del ) { + $post_del = & get_post($post_id_del); - if ( -1 == $_GET['_status'] ) { - $_GET['post_status'] = null; - unset($_GET['_status'], $_GET['post_status']); + if ( !current_user_can('delete_page', $post_id_del) ) + wp_die( __('You are not allowed to delete this page.') ); + + if ( $post_del->post_type == 'attachment' ) { + if ( ! wp_delete_attachment($post_id_del) ) + wp_die( __('Error in deleting...') ); } else { - $_GET['post_status'] = $_GET['_status']; + if ( !wp_delete_post($post_id_del) ) + wp_die( __('Error in deleting...') ); } - - $done = bulk_edit_posts($_GET); + $deleted++; } break; + case 'edit': + if ( -1 == $_GET['_status'] ) { + $_GET['post_status'] = null; + unset($_GET['_status'], $_GET['post_status']); + } else { + $_GET['post_status'] = $_GET['_status']; + } + + $done = bulk_edit_posts($_GET); + break; } $sendback = wp_get_referer(); @@ -62,6 +88,10 @@ } if ( isset($deleted) ) $sendback = add_query_arg('deleted', $deleted, $sendback); + elseif ( isset($trashed) ) + $sendback = add_query_arg('trashed', $trashed, $sendback); + elseif ( isset($untrashed) ) + $sendback = add_query_arg('untrashed', $untrashed, $sendback); wp_redirect($sendback); exit(); } elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { @@ -79,7 +109,8 @@ 'future' => array(_x('Scheduled', 'page'), __('Scheduled pages'), _nx_noop('Scheduled (%s)', 'Scheduled (%s)', 'page')), 'pending' => array(_x('Pending Review', 'page'), __('Pending pages'), _nx_noop('Pending Review (%s)', 'Pending Review (%s)', 'page')), 'draft' => array(_x('Draft', 'page'), _x('Drafts', 'manage posts header'), _nx_noop('Draft (%s)', 'Drafts (%s)', 'page')), - 'private' => array(_x('Private', 'page'), __('Private pages'), _nx_noop('Private (%s)', 'Private (%s)', 'page')) + 'private' => array(_x('Private', 'page'), __('Private pages'), _nx_noop('Private (%s)', 'Private (%s)', 'page')), + 'trash' => array(_x('Trash', 'page'), __('Trash pages'), _nx_noop('Trash (%s)', 'Trash (%s)', 'page')) ); $post_stati = apply_filters('page_stati', $post_stati); @@ -111,28 +142,33 @@ printf( '' . __('Search results for “%s”') . '', esc_html( get_search_query() ) ); ?> - +

    @@ -150,7 +186,7 @@ if ( empty($locked_post_status) ) : $status_links = array(); $num_posts = wp_count_posts('page', 'readable'); -$total_posts = array_sum( (array) $num_posts ); +$total_posts = array_sum( (array) $num_posts ) - $num_posts->trash; $class = empty($_GET['post_status']) ? ' class="current"' : ''; $status_links[] = "
  • " . sprintf( _nx( 'All (%s)', 'All (%s)', $total_posts, 'pages' ), number_format_i18n( $total_posts ) ) . ''; foreach ( $post_stati as $status => $label ) { @@ -212,11 +248,19 @@
    + + +

    @@ -251,10 +295,18 @@
    + + +