<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][11788] trunk/src/bp-blogs: Blogs: Disable activity commenting for blog items requiring manual approval.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/11788">11788</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/11788","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-01-02 22:28:52 +0000 (Tue, 02 Jan 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://buddypress.trac.wordpress.org/ticket/7592">#7592</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogsactivityphp">trunk/src/bp-blogs/bp-blogs-activity.php</a></li>
<li><a href="#trunksrcbpblogsbpblogsfunctionsphp">trunk/src/bp-blogs/bp-blogs-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsbpblogsactivityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/bp-blogs-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-activity.php 2018-01-02 17:36:05 UTC (rev 11787)
+++ trunk/src/bp-blogs/bp-blogs-activity.php 2018-01-02 22:28:52 UTC (rev 11788)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1148,6 +1148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $allow_comments = bp_blogs_comments_open( $activity );
</span><span class="cx" style="display: block; padding: 0 10px"> $thread_depth = bp_blogs_get_blogmeta( $activity->item_id, 'thread_comments_depth' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $moderation = bp_blogs_get_blogmeta( $activity->item_id, 'comment_moderation' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Initialize a local object so we won't have to query this again in the
</span><span class="cx" style="display: block; padding: 0 10px"> // comment loop.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1157,16 +1158,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( buddypress()->blogs->thread_depth ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> buddypress()->blogs->thread_depth = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( buddypress()->blogs->comment_moderation ) ) {
+ buddypress()->blogs->comment_moderation = array();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * 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;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1231,6 +1239,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( buddypress()->blogs->allow_comments[ bp_get_activity_id() ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // If comments need moderation, disable activity commenting.
+ if ( ! empty( buddypress()->blogs->comment_moderation[ bp_get_activity_id() ] ) ) {
+ $retval = false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> // The activity type does not support comments or replies
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1314,6 +1327,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If comments need moderation, disable activity commenting.
+ if ( ! empty( buddypress()->blogs->comment_moderation[$comment->item_id] ) ) {
+ $retval = false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $retval;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_activity_can_comment_reply', 'bp_blogs_can_comment_reply', 10, 2 );
</span></span></pre></div>
<a id="trunksrcbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/bp-blogs-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-functions.php 2018-01-02 17:36:05 UTC (rev 11787)
+++ trunk/src/bp-blogs/bp-blogs-functions.php 2018-01-02 22:28:52 UTC (rev 11788)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,6 +362,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $description = get_blog_option( $blog_id, 'blogdescription' );
</span><span class="cx" style="display: block; padding: 0 10px"> $close_old_posts = get_blog_option( $blog_id, 'close_comments_for_old_posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> $close_days_old = get_blog_option( $blog_id, 'close_comments_days_old' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $moderation = get_blog_option( $blog_id, 'comment_moderation' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $thread_depth = get_blog_option( $blog_id, 'thread_comments' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $thread_depth ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,6 +385,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'close_comments_for_old_posts', $close_old_posts );
</span><span class="cx" style="display: block; padding: 0 10px"> bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'close_comments_days_old', $close_days_old );
</span><span class="cx" style="display: block; padding: 0 10px"> bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'thread_comments_depth', $thread_depth );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'comment_moderation', $moderation );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $is_private = !empty( $_POST['blog_public'] ) && (int) $_POST['blog_public'] ? false : true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -526,6 +528,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'update_option_thread_comments_depth', 'bp_blogs_update_option_thread_comments_depth', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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 );
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Syncs site icon URLs to blogmeta.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span></span></pre>
</div>
</div>
</body>
</html>