Changeset 11788

Timestamp:

01/02/2018 10:28:52 PM (7 years ago)

Author:

r-a-y

Message:

Blogs: Disable activity commenting for blog items requiring manual approval.

For sites that have the "Comment must be manually approved" option enabled,
we are disabling activity commenting for these activity entries since there
is currently no way for us to replicate the WordPress pending comment
experience within the BuddyPress activity stream.

Users will still be able to comment on the original blog post, but will no
longer be able to comment within the BuddyPress activity stream.

Hat-tip aleon4 for reporting this issue.

Fixes #7592.

Location:

trunk/src/bp-blogs

Files:

• bp-blogs-activity.php (modified) (4 diffs)
• bp-blogs-functions.php (modified) (3 diffs)

trunk/src/bp-blogs/bp-blogs-activity.php

@@ -1149 +1149 @@
     $allow_comments = bp_blogs_comments_open( $activity );
     $thread_depth   = bp_blogs_get_blogmeta( $activity->item_id, 'thread_comments_depth' );
+    $moderation     = bp_blogs_get_blogmeta( $activity->item_id, 'comment_moderation' );
 
     // Initialize a local object so we won't have to query this again in the
@@ -1158 +1159 @@
         buddypress()->blogs->thread_depth   = array();
     }
-
-    // Cache comment settings in the buddypress() singleton to reference later in
-    // the activity comment loop
-    // @see bp_blogs_disable_activity_replies()
-    //
-    // thread_depth is keyed by activity ID instead of blog ID because when we're
-    // in a comment loop, we don't have access to the blog ID...
-    // should probably object cache these values instead...
-    buddypress()->blogs->allow_comments[ $activity->id ] = $allow_comments;
-    buddypress()->blogs->thread_depth[ $activity->id ]   = $thread_depth;
+    if ( empty( buddypress()->blogs->comment_moderation ) ) {
+        buddypress()->blogs->comment_moderation = array();
+    }
+
+    /*
+     * Cache comment settings in the buddypress() singleton for later reference.
+     *
+     * See bp_blogs_disable_activity_commenting() / bp_blogs_can_comment_reply().
+     *
+     * thread_depth is keyed by activity ID instead of blog ID because when we're
+     * in an actvity comment loop, we don't have access to the blog ID...
+     *
+     * Should probably object cache these values instead...
+     */
+    buddypress()->blogs->allow_comments[ $activity->id ]     = $allow_comments;
+    buddypress()->blogs->thread_depth[ $activity->id ]       = $thread_depth;
+    buddypress()->blogs->comment_moderation[ $activity->id ] = $moderation;
 }
 
@@ -1232 +1240 @@
                 $retval = false;
             }
+
+            // If comments need moderation, disable activity commenting.
+            if ( ! empty( buddypress()->blogs->comment_moderation[ bp_get_activity_id() ] ) ) {
+                $retval = false;
+            }
         // The activity type does not support comments or replies
         } else {
@@ -1315 +1328 @@
     }
 
+    // If comments need moderation, disable activity commenting.
+    if ( ! empty( buddypress()->blogs->comment_moderation[$comment->item_id] ) ) {
+        $retval = false;
+    }
+
     return $retval;
 }

trunk/src/bp-blogs/bp-blogs-functions.php

@@ -363 +363 @@
     $close_old_posts = get_blog_option( $blog_id, 'close_comments_for_old_posts' );
     $close_days_old  = get_blog_option( $blog_id, 'close_comments_days_old' );
+    $moderation      = get_blog_option( $blog_id, 'comment_moderation' );
 
     $thread_depth = get_blog_option( $blog_id, 'thread_comments' );
@@ -385 +386 @@
     bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'close_comments_days_old', $close_days_old );
     bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'thread_comments_depth', $thread_depth );
+    bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'comment_moderation', $moderation );
 
     $is_private = !empty( $_POST['blog_public'] ) && (int) $_POST['blog_public'] ? false : true;
@@ -525 +527 @@
 }
 add_action( 'update_option_thread_comments_depth', 'bp_blogs_update_option_thread_comments_depth', 10, 2 );
+
+/**
+ * When updating comment moderation, mirror value in blogmeta table.
+ *
+ * @since 3.0.0
+ *
+ * @param string $oldvalue Value before save. Passed by do_action() but unused here.
+ * @param string $newvalue Value to change meta to.
+ */
+function bp_blogs_update_option_comment_moderation( $oldvalue, $newvalue ) {
+    bp_blogs_update_blogmeta( $GLOBALS['wpdb']->blogid, 'comment_moderation', $newvalue );
+}
+add_action( 'update_option_comment_moderation', 'bp_blogs_update_option_comment_moderation', 10, 2 );
 
 /**