<!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][11764] trunk/src: Update internal comments/strings with relation to recent Legacy Forums removal.</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/11764">11764</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/11764","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-12-08 15:52:14 +0000 (Fri, 08 Dec 2017)</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'>Update internal comments/strings with relation to recent Legacy Forums removal.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityadminphp">trunk/src/bp-activity/bp-activity-admin.php</a></li>
<li><a href="#trunksrcbpactivitybpactivityfunctionsphp">trunk/src/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunksrcbpactivitybpactivitynotificationsphp">trunk/src/bp-activity/bp-activity-notifications.php</a></li>
<li><a href="#trunksrcbpactivitybpactivitytemplatephp">trunk/src/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunksrcbpactivityclassesclassbpactivitylisttablephp">trunk/src/bp-activity/classes/class-bp-activity-list-table.php</a></li>
<li><a href="#trunksrcbpactivityclassesclassbpactivitytemplatephp">trunk/src/bp-activity/classes/class-bp-activity-template.php</a></li>
<li><a href="#trunksrcbpcoreadminbpcoreadminsettingsphp">trunk/src/bp-core/admin/bp-core-admin-settings.php</a></li>
<li><a href="#trunksrcbpcorebpcoreoptionsphp">trunk/src/bp-core/bp-core-options.php</a></li>
<li><a href="#trunksrcbpcoreclassesclassbpadminphp">trunk/src/bp-core/classes/class-bp-admin.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsfiltersphp">trunk/src/bp-groups/bp-groups-filters.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsfunctionsphp">trunk/src/bp-groups/bp-groups-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-admin.php 2017-12-08 00:22:09 UTC (rev 11763)
+++ trunk/src/bp-activity/bp-activity-admin.php 2017-12-08 15:52:14 UTC (rev 11764)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,7 +232,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Item, Link, Type', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' =>
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<strong>Primary Item/Secondary Item</strong> - These identify the object that created the activity. For example, the fields could reference a comment left on a specific site. Some types of activity may only use one, or none, of these fields.', 'buddypress' ) . '</p>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( '<strong>Link</strong> - Used by some types of activity (e.g blog posts and comments, and forum topics and replies) to store a link back to the original content.', 'buddypress' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( '<strong>Link</strong> - Used by some types of activity (blog posts and comments) to store a link back to the original content.', 'buddypress' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<strong>Type</strong> - Each distinct kind of activity has its own type. For example, <code>created_group</code> is used when a group is created and <code>joined_group</code> is used when a user joins a group.', 'buddypress' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'For information about when and how BuddyPress uses all of these settings, see the Managing Activity link in the panel to the side.', 'buddypress' ) . '</p>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -800,7 +800,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'Link', 'buddypress' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="url" name="bp-activities-link" id="bp-activities-link" value="<?php echo esc_url( $item->primary_link ); ?>" aria-describedby="bp-activities-link-description" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p id="bp-activities-link-description"><?php _e( 'Activity generated by posts and comments, forum topics and replies, and some plugins, uses the link field for a permalink back to the content item.', 'buddypress' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p id="bp-activities-link-description"><?php _e( 'Activity generated by posts and comments uses the link field for a permalink back to the content item.', 'buddypress' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-functions.php 2017-12-08 00:22:09 UTC (rev 11763)
+++ trunk/src/bp-activity/bp-activity-functions.php 2017-12-08 15:52:14 UTC (rev 11764)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1703,7 +1703,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 'user_id' => false, // User ID to filter on.
</span><span class="cx" style="display: block; padding: 0 10px"> * 'object' => false, // Object to filter on e.g. groups, profile, status, friends.
</span><span class="cx" style="display: block; padding: 0 10px"> * 'action' => false, // Action to filter on e.g. activity_update, profile_updated.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 'primary_id' => false, // Object ID to filter on e.g. a group_id or forum_id or blog_id etc.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 'primary_id' => false, // Object ID to filter on e.g. a group_id or blog_id etc.
</ins><span class="cx" style="display: block; padding: 0 10px"> * 'secondary_id' => false, // Secondary object ID to filter on e.g. a post_id.
</span><span class="cx" style="display: block; padding: 0 10px"> * );
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcbpactivitybpactivitynotificationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-notifications.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-notifications.php 2017-12-08 00:22:09 UTC (rev 11763)
+++ trunk/src/bp-activity/bp-activity-notifications.php 2017-12-08 15:52:14 UTC (rev 11764)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,7 +289,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Add a notification for post comments to the post author or post commenter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Requires "activity stream commenting on blog and forum posts" to be enabled.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Requires "activity stream commenting on posts and comments" to be enabled.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-template.php 2017-12-08 00:22:09 UTC (rev 11763)
+++ trunk/src/bp-activity/bp-activity-template.php 2017-12-08 15:52:14 UTC (rev 11764)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,8 +266,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Filtering
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $user_id, // user_id to filter on.
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => $object, // Object to filter on e.g. groups, profile, status, friends.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'action' => false, // Action to filter on e.g. activity_update, new_forum_post, profile_updated.
- 'primary_id' => $primary_id, // Object ID to filter on e.g. a group_id or forum_id or blog_id etc.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'action' => false, // Action to filter on e.g. activity_update, profile_updated.
+ 'primary_id' => $primary_id, // Object ID to filter on e.g. a group_id or blog_id etc.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'secondary_id' => false, // Secondary object ID to filter on e.g. a post_id.
</span><span class="cx" style="display: block; padding: 0 10px"> 'offset' => false, // Return only items >= this ID.
</span><span class="cx" style="display: block; padding: 0 10px"> 'since' => false, // Return only items recorded since this Y-m-d H:i:s date.
</span></span></pre></div>
<a id="trunksrcbpactivityclassesclassbpactivitylisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/classes/class-bp-activity-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/classes/class-bp-activity-list-table.php 2017-12-08 00:22:09 UTC (rev 11763)
+++ trunk/src/bp-activity/classes/class-bp-activity-list-table.php 2017-12-08 15:52:14 UTC (rev 11764)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected $activity_user_id = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * If users can comment on blog & forum activity items.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If users can comment on post and comment activity items.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @link https://buddypress.trac.wordpress.org/ticket/6277
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // See if activity commenting is enabled for blog / forum activity items.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // See if activity commenting is enabled for post/comment activity items.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->disable_blogforum_comments = bp_disable_blogforum_comments();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Define singular and plural labels, as well as whether we support AJAX.
</span></span></pre></div>
<a id="trunksrcbpactivityclassesclassbpactivitytemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/classes/class-bp-activity-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/classes/class-bp-activity-template.php 2017-12-08 00:22:09 UTC (rev 11763)
+++ trunk/src/bp-activity/classes/class-bp-activity-template.php 2017-12-08 15:52:14 UTC (rev 11764)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,7 +191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->pag_page = bp_sanitize_pagination_arg( $this->pag_arg, $r['page'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->pag_num = bp_sanitize_pagination_arg( 'num', $r['per_page'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Check if blog/forum replies are disabled.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check if post/comment replies are disabled.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->disable_blogforum_replies = (bool) bp_core_get_root_option( 'bp-disable-blogforum-comments' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get an array of the logged in user's favorite activities.
</span></span></pre></div>
<a id="trunksrcbpcoreadminbpcoreadminsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/admin/bp-core-admin-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/admin/bp-core-admin-settings.php 2017-12-08 00:22:09 UTC (rev 11763)
+++ trunk/src/bp-core/admin/bp-core-admin-settings.php 2017-12-08 15:52:14 UTC (rev 11764)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +104,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Allow activity comments on blog posts and forum posts.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Allow activity comments on posts and comments.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@
</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"> <input id="bp-disable-blogforum-comments" name="bp-disable-blogforum-comments" type="checkbox" value="1" <?php checked( !bp_disable_blogforum_comments( false ) ); ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="bp-disable-blogforum-comments"><?php _e( 'Allow activity stream commenting on blog and forum posts', 'buddypress' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="bp-disable-blogforum-comments"><?php _e( 'Allow activity stream commenting on posts and comments', 'buddypress' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,7 +134,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Sanitization for bp-disable-blogforum-comments setting.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * In the UI, a checkbox asks whether you'd like to *enable* blog/forum activity comments. For
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * In the UI, a checkbox asks whether you'd like to *enable* post/comment activity comments. For
</ins><span class="cx" style="display: block; padding: 0 10px"> * legacy reasons, the option that we store is 1 if these comments are *disabled*. So we use this
</span><span class="cx" style="display: block; padding: 0 10px"> * function to flip the boolean before saving the intval.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcbpcorebpcoreoptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-options.php 2017-12-08 00:22:09 UTC (rev 11763)
+++ trunk/src/bp-core/bp-core-options.php 2017-12-08 15:52:14 UTC (rev 11764)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Allow users to delete their own accounts.
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp-disable-account-deletion' => false,
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Allow comments on blog and forum activity items.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow comments on post and comment activity items.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'bp-disable-blogforum-comments' => true,
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The ID for the current theme package.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,7 +621,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Are blog and forum activity stream comments disabled?
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Are post/comment activity stream comments disabled?
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcbpcoreclassesclassbpadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/classes/class-bp-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/classes/class-bp-admin.php 2017-12-08 00:22:09 UTC (rev 11763)
+++ trunk/src/bp-core/classes/class-bp-admin.php 2017-12-08 15:52:14 UTC (rev 11764)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,8 +450,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the main section.
</span><span class="cx" style="display: block; padding: 0 10px"> add_settings_section( 'bp_activity', __( 'Activity Settings', 'buddypress' ), 'bp_admin_setting_callback_activity_section', 'buddypress' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Activity commenting on blog and forum posts.
- add_settings_field( 'bp-disable-blogforum-comments', __( 'Blog & Forum Comments', 'buddypress' ), 'bp_admin_setting_callback_blogforum_comments', 'buddypress', 'bp_activity' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Activity commenting on post and comments.
+ add_settings_field( 'bp-disable-blogforum-comments', __( 'Post Comments', 'buddypress' ), 'bp_admin_setting_callback_blogforum_comments', 'buddypress', 'bp_activity' );
</ins><span class="cx" style="display: block; padding: 0 10px"> register_setting( 'buddypress', 'bp-disable-blogforum-comments', 'bp_admin_sanitize_callback_blogforum_comments' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Activity Heartbeat refresh.
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-filters.php 2017-12-08 00:22:09 UTC (rev 11763)
+++ trunk/src/bp-groups/bp-groups-filters.php 2017-12-08 15:52:14 UTC (rev 11764)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Exit if accessed directly.
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'ABSPATH' ) || exit;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Filter bbPress template locations.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Filter BuddyPress template locations.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_groups_get_directory_template', 'bp_add_template_locations' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_get_single_group_template', 'bp_add_template_locations' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-functions.php 2017-12-08 00:22:09 UTC (rev 11763)
+++ trunk/src/bp-groups/bp-groups-functions.php 2017-12-08 15:52:14 UTC (rev 11764)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,8 +88,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 'hidden'. Defaults to 'public'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $parent_id The ID of the parent group. Default: 0.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $enable_forum Optional. Whether the group has a forum enabled.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * If the legacy forums are enabled for this group
- * or if a bbPress forum is enabled for the group,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If a bbPress forum is enabled for the group,
</ins><span class="cx" style="display: block; padding: 0 10px"> * set this to 1. Default: 0.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $date_created The GMT time, in Y-m-d h:i:s format, when the group
</span><span class="cx" style="display: block; padding: 0 10px"> * was created. Defaults to the current time.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -769,7 +768,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function groups_get_groups( $args = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type' => false, // Active, newest, alphabetical, random, popular, most-forum-topics or most-forum-posts.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => false, // Active, newest, alphabetical, random, popular.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC', // 'ASC' or 'DESC'
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'date_created', // date_created, last_activity, total_member_count, name, random, meta_id.
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => false, // Pass a user_id to limit to only groups that this user is a member of.
</span></span></pre>
</div>
</div>
</body>
</html>