Changeset 7208

Timestamp:

09/21/2021 01:11:47 AM (3 years ago)

Author:

johnjamesjacoby

Message:

Content: add post_parent to forum & topic duplicate checks.

This change limits the scope of "duplicate content" to its parent context, meaning that replies must be to the same topic, topics must be in the same forum, and forums must be in the same sub-forum (or root) to be considered a duplicate.

This better implements the spirit of this feature which is to prevent accidental/unintended duplicates, and is not intended to simply prevent globally similar content by the same author.

Props r-a-y, johnjamesjacoby.

In branches/2.6, for 2.6.7.

Fixes #3418.

Location:

branches/2.6/src/includes

Files:

• forums/functions.php (modified) (1 diff)
• replies/functions.php (modified) (1 diff)
• topics/functions.php (modified) (1 diff)

branches/2.6/src/includes/forums/functions.php

@@ -231 +231 @@
     /** Forum Duplicate *******************************************************/
 
-    if ( ! bbp_check_for_duplicate( array( 'post_type' => bbp_get_forum_post_type(), 'post_author' => $forum_author, 'post_content' => $forum_content, 'anonymous_data' => $anonymous_data ) ) ) {
+    $dupe_args = array(
+        'post_type'      => bbp_get_forum_post_type(),
+        'post_author'    => $forum_author,
+        'post_content'   => $forum_content,
+        'post_parent'    => $forum_parent_id,
+        'anonymous_data' => $anonymous_data
+    );
+
+    if ( ! bbp_check_for_duplicate( $dupe_args ) ) {
         bbp_add_error( 'bbp_forum_duplicate', __( '<strong>Error</strong>: This forum already exists.', 'bbpress' ) );
     }

branches/2.6/src/includes/replies/functions.php

@@ -307 +307 @@
     /** Reply Duplicate *******************************************************/
 
-    if ( ! bbp_check_for_duplicate( array( 'post_type' => bbp_get_reply_post_type(), 'post_author' => $reply_author, 'post_content' => $reply_content, 'post_parent' => $topic_id, 'anonymous_data' => $anonymous_data ) ) ) {
+    $dupe_args = array(
+        'post_type'      => bbp_get_reply_post_type(),
+        'post_author'    => $reply_author,
+        'post_content'   => $reply_content,
+        'post_parent'    => $topic_id,
+        'anonymous_data' => $anonymous_data
+    );
+
+    if ( ! bbp_check_for_duplicate( $dupe_args ) ) {
         bbp_add_error( 'bbp_reply_duplicate', __( '<strong>Error</strong>: Duplicate reply detected; it looks as though you&#8217;ve already said that.', 'bbpress' ) );
     }

branches/2.6/src/includes/topics/functions.php

@@ -250 +250 @@
     /** Topic Duplicate *******************************************************/
 
-    if ( ! bbp_check_for_duplicate( array( 'post_type' => bbp_get_topic_post_type(), 'post_author' => $topic_author, 'post_content' => $topic_content, 'anonymous_data' => $anonymous_data ) ) ) {
+    $dupe_args = array(
+        'post_type'      => bbp_get_topic_post_type(),
+        'post_author'    => $topic_author,
+        'post_content'   => $topic_content,
+        'post_parent'    => $forum_id,
+        'anonymous_data' => $anonymous_data
+    );
+
+    if ( ! bbp_check_for_duplicate( $dupe_args ) ) {
         bbp_add_error( 'bbp_topic_duplicate', __( '<strong>Error</strong>: Duplicate topic detected; it looks as though you&#8217;ve already said that.', 'bbpress' ) );
     }