Changeset 31195

Timestamp:

01/16/2015 02:38:30 AM (10 years ago)

Author:

pento

Message:

Allow comment_post_ID to be passed to wp_update_comment(), so that a comment can be moved to a different post.

Props tyxla, rachelbaker

Fixes #30946

Location:

trunk

Files:

• src/wp-includes/comment.php (modified) (2 diffs)
• tests/phpunit/tests/comment.php (modified) (2 diffs)

trunk/src/wp-includes/comment.php

@@ -2206 +2206 @@
         return 0;
     }
+
+    // Make sure that the comment post ID is valid (if specified).
+    if ( isset( $commentarr['comment_post_ID'] ) && ! get_post( $commentarr['comment_post_ID'] ) ) {
+        return 0;
+    }
+
     // Escape data pulled from DB.
     $comment = wp_slash($comment);
@@ -2240 +2246 @@
     $comment_ID = $data['comment_ID'];
     $comment_post_ID = $data['comment_post_ID'];
-    $keys = array( 'comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt', 'comment_type', 'comment_parent', 'user_id' );
+    $keys = array( 'comment_post_ID', 'comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt', 'comment_type', 'comment_parent', 'user_id' );
     $data = wp_array_slice_assoc( $data, $keys );
     $rval = $wpdb->update( $wpdb->comments, $data, compact( 'comment_ID' ) );

trunk/tests/phpunit/tests/comment.php

@@ -7 +7 @@
     function test_wp_update_comment() {
         $post = $this->factory->post->create_and_get( array( 'post_title' => 'some-post', 'post_type' => 'post' ) );
+        $post2 = $this->factory->post->create_and_get( array( 'post_title' => 'some-post-2', 'post_type' => 'post' ) );
         $comments = $this->factory->comment->create_post_comments( $post->ID, 5 );
         $result = wp_update_comment( array( 'comment_ID' => $comments[0], 'comment_parent' => $comments[1] ) );
@@ -14 +15 @@
         $result = wp_update_comment( array( 'comment_ID' => $comments[0], 'comment_parent' => $comments[1] ) );
         $this->assertEquals( 0, $result );
+        $result = wp_update_comment( array( 'comment_ID' => $comments[0], 'comment_post_ID' => $post2->ID ) );
+        $comment = get_comment( $comments[0] );
+        $this->assertEquals( $post2->ID, $comment->comment_post_ID );
     }