Changeset 12290

Timestamp:

11/28/2009 03:56:20 AM (16 years ago)

Author:

azaozz

Message:

"Trash" fixes, props caesarsgrunt, see #4529

Location:

trunk

Files:

• wp-admin/upload.php (modified) (1 diff)
• wp-includes/comment.php (modified) (2 diffs)

trunk/wp-admin/upload.php

@@ -207 +207 @@
 $messages[2] = __('Media permanently deleted.');
 $messages[3] = __('Error saving media attachment.');
-$messages[4] = __('Media moved to the trash.') . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.$_GET['ids'], "bulk-media" ) ) . '">' . __('Undo?') . '</a>';
+$messages[4] = __('Media moved to the trash.') . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __('Undo?') . '</a>';
 $messages[5] = __('Media restored from the trash.');
 

trunk/wp-includes/comment.php

@@ -893 +893 @@
     do_action('untrash_comment', $comment_id);
 
-    $comment = array('comment_ID' => $comment_id);
-
-    $status = get_comment_meta($comment_id, '_wp_trash_meta_status', true);
+    $status = (string) get_comment_meta($comment_id, '_wp_trash_meta_status', true);
     if ( empty($status) )
         $status = '0';
 
-    $comment['comment_approved'] = $status;
-
-    if ( wp_update_comment($comment) ) {
+    if ( wp_set_comment_status($comment_id, $status) ) {
         delete_comment_meta($comment_id, '_wp_trash_meta_time');
         delete_comment_meta($comment_id, '_wp_trash_meta_status');
@@ -952 +948 @@
     do_action('unspam_comment', $comment_id);
 
-    $status = get_comment_meta($comment_id, '_wp_trash_meta_status', true);
+    $status = (string) get_comment_meta($comment_id, '_wp_trash_meta_status', true);
     if ( empty($status) )
         $status = '0';
 
-    if ( wp_set_comment_status($comment_id, "$status") ) {
+    if ( wp_set_comment_status($comment_id, $status) ) {
         delete_comment_meta($comment_id, '_wp_trash_meta_status');
         do_action('unspammed_comment', $comment_id);