<!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][10546] trunk/src/bp-activity/classes/class-bp-activity-list-table.php: Post Type Activities: make sure it is possible to filter by post type activity comment action within the Activity Administration screen.</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/10546">10546</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/10546","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-07 16:59:52 +0000 (Sun, 07 Feb 2016)</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'>Post Type Activities: make sure it is possible to filter by post type activity comment action within the Activity Administration screen.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6482">#6482</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivityclassesclassbpactivitylisttablephp">trunk/src/bp-activity/classes/class-bp-activity-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2016-02-07 16:55:04 UTC (rev 10545)
+++ trunk/src/bp-activity/classes/class-bp-activity-list-table.php 2016-02-07 16:59:52 UTC (rev 10546)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,6 +84,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Option defaults.
</span><span class="cx" style="display: block; padding: 0 10px"> $filter = array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filter_query = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> $include_id = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $search_terms = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $sort = 'DESC';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,9 +111,27 @@
</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"> // Filter.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty( $_REQUEST['activity_type'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_REQUEST['activity_type'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filter = array( 'action' => $_REQUEST['activity_type'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filter here to override the filter with a filter query
+ *
+ * @since 2.5.0
+ *
+ * @param array $filter
+ */
+ $has_filter_query = apply_filters( 'bp_activity_list_table_filter_activity_type_items', $filter );
+
+ if ( ! empty( $has_filter_query['filter_query'] ) ) {
+ // Reset the filter
+ $filter = array();
+
+ // And use the filter query instead
+ $filter_query = $has_filter_query['filter_query'];
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Are we doing a search?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $_REQUEST['s'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $search_terms = $_REQUEST['s'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,6 +158,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => $page,
</span><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => $per_page,
</span><span class="cx" style="display: block; padding: 0 10px"> 'search_terms' => $search_terms,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'filter_query' => $filter_query,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_hidden' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> // 'sort' => $sort,
</span><span class="cx" style="display: block; padding: 0 10px"> 'spam' => $spam,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -742,50 +762,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * functions from working as intended.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.5.0 Include Post type activities types
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $item An array version of the BP_Activity_Activity object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool $can_comment
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function can_comment( $item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $can_comment = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $can_comment = bp_activity_type_supports( $item['type'], 'comment-reply' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->disable_blogforum_comments ) {
- switch ( $item['type'] ) {
- case 'new_blog_post' :
- case 'new_blog_comment' :
- case 'new_forum_topic' :
- case 'new_forum_post' :
- $can_comment = false;
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $this->disable_blogforum_comments && bp_is_active( 'blogs' ) ) {
+ $parent_activity = false;
+
+ if ( bp_activity_type_supports( $item['type'], 'post-type-comment-tracking' ) ) {
+ $parent_activity = (object) $item;
+ } elseif ( 'activity_comment' === $item['type'] ) {
+ $parent_activity = new BP_Activity_Activity( $item['item_id'] );
</ins><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">- // Activity comments supported.
- } else {
- // Activity comment.
- if ( 'activity_comment' == $item['type'] ) {
- // Blogs.
- if ( bp_is_active( 'blogs' ) ) {
- // Grab the parent activity entry.
- $parent_activity = new BP_Activity_Activity( $item['item_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $parent_activity->type ) && bp_activity_post_type_get_tracking_arg( $parent_activity->type, 'post_type' ) ) {
+ // Fetch blog post comment depth and if the blog post's comments are open.
+ bp_blogs_setup_activity_loop_globals( $parent_activity );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Fetch blog post comment depth and if the blog post's comments are open.
- bp_blogs_setup_activity_loop_globals( $parent_activity );
-
- // Check if the activity item can be replied to.
- if ( false === bp_blogs_can_comment_reply( true, $item ) ) {
- $can_comment = false;
- }
- }
-
- // Blog post.
- } elseif ( 'new_blog_post' == $item['type'] ) {
- if ( bp_is_active( 'blogs' ) ) {
- bp_blogs_setup_activity_loop_globals( (object) $item );
-
- if ( empty( buddypress()->blogs->allow_comments[$item['id']] ) ) {
- $can_comment = false;
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $can_comment = bp_blogs_can_comment_reply( true, $item );
</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">@@ -793,10 +791,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters if an activity item can be commented on or not.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.5.0 Add a second parameter to include the activity item into the filter.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $can_comment Whether an activity item can be commented on or not.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $can_comment Whether an activity item can be commented on or not.
+ * @param array $item An array version of the BP_Activity_Activity object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'bp_activity_list_table_can_comment', $can_comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'bp_activity_list_table_can_comment', $can_comment, $item );
</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></pre>
</div>
</div>
</body>
</html>