Changeset 11997

Timestamp:

10/05/2009 01:49:19 AM (15 years ago)

Author:

azaozz

Message:

Add conditional to handle get_comment_meta() return value, make #comment_id required arg for wp_trash_comment() and wp_untrash_comment(), see #4529

File:

• trunk/wp-includes/comment.php (modified) (2 diffs)

trunk/wp-includes/comment.php

@@ -854 +854 @@
  * @return mixed False on failure
  */
-function wp_trash_comment($comment_id = 0) {
-    if (EMPTY_TRASH_DAYS == 0)
+function wp_trash_comment($comment_id) {
+    if ( EMPTY_TRASH_DAYS == 0 )
         return wp_delete_comment($comment_id);
 
-    if (!$comment = get_comment($comment_id))
+    if ( !$comment = get_comment($comment_id) )
         return false;
 
     do_action('trash_comment', $comment_id);
 
-    add_comment_meta($comment_id,'_wp_trash_meta_status', $comment->comment_approved);
-    add_comment_meta($comment_id,'_wp_trash_meta_time', time() );
+    add_comment_meta($comment_id, '_wp_trash_meta_status', $comment->comment_approved);
+    add_comment_meta($comment_id, '_wp_trash_meta_time', time() );
 
     wp_set_comment_status($comment_id, 'trash');
@@ -883 +883 @@
  * @return mixed False on failure
  */
-function wp_untrash_comment($comment_id = 0) {
+function wp_untrash_comment($comment_id) {
+    if ( ! (int)$comment_id )
+        return false;
+
     do_action('untrash_comment', $comment_id);
 
-    $comment = array('comment_ID'=>$comment_id, 'comment_approved'=>'0');
-
-    //Either set comment_approved to the value in comment_meta or worse case to false which will mean moderation
-    $comment['comment_approved'] = get_comment_meta($comment_id, '_wp_trash_meta_status', true);
+    $comment = array('comment_ID'=>$comment_id);
+
+    $status = get_comment_meta($comment_id, '_wp_trash_meta_status', true);
+    if ( false === $status || '' === $status )
+        $status = '0';
+
+    $comment['comment_approved'] = $status;
 
     delete_comment_meta($comment_id, '_wp_trash_meta_time'); 
     delete_comment_meta($comment_id, '_wp_trash_meta_status'); 
-    
+
     wp_update_comment($comment);
-        
+
     do_action('untrashed_comment', $comment_id);