sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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



git-svn-id: https://develop.svn.wordpress.org/trunk@31195 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast 2015-01-16 02:38:30 +00:00
parent 28d654837d
commit 58d931dfc7
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wp-includes/comment.php
View File

@ -2205,6 +2205,12 @@ function wp_update_comment($commentarr) {
if ( empty( $comment ) ) { if ( empty( $comment ) ) {
return 0; 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. // Escape data pulled from DB.
$comment = wp_slash($comment); $comment = wp_slash($comment);
@ -2239,7 +2245,7 @@ function wp_update_comment($commentarr) {
$comment_ID = $data['comment_ID']; $comment_ID = $data['comment_ID'];
$comment_post_ID = $data['comment_post_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 ); $data = wp_array_slice_assoc( $data, $keys );
$rval = $wpdb->update( $wpdb->comments, $data, compact( 'comment_ID' ) ); $rval = $wpdb->update( $wpdb->comments, $data, compact( 'comment_ID' ) );

4
tests/phpunit/tests/comment.php
View File

@ -6,6 +6,7 @@
class Tests_Comment extends WP_UnitTestCase { class Tests_Comment extends WP_UnitTestCase {
function test_wp_update_comment() { function test_wp_update_comment() {
$post = $this->factory->post->create_and_get( array( 'post_title' => 'some-post', 'post_type' => 'post' ) ); $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 ); $comments = $this->factory->comment->create_post_comments( $post->ID, 5 );
$result = wp_update_comment( array( 'comment_ID' => $comments[0], 'comment_parent' => $comments[1] ) ); $result = wp_update_comment( array( 'comment_ID' => $comments[0], 'comment_parent' => $comments[1] ) );
$this->assertEquals( 1, $result ); $this->assertEquals( 1, $result );
@ -13,6 +14,9 @@ class Tests_Comment extends WP_UnitTestCase {
$this->assertEquals( $comments[1], $comment->comment_parent ); $this->assertEquals( $comments[1], $comment->comment_parent );
$result = wp_update_comment( array( 'comment_ID' => $comments[0], 'comment_parent' => $comments[1] ) ); $result = wp_update_comment( array( 'comment_ID' => $comments[0], 'comment_parent' => $comments[1] ) );
$this->assertEquals( 0, $result ); $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 );
} }
/** /**