<!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][8249] trunk: By default, BP_Activity_Activity::get_registered_components() should not return components with only last_activity items</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8249">8249</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-04-07 17:33:26 +0000 (Mon, 07 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>By default, BP_Activity_Activity::get_registered_components() should not return components with only last_activity items
Since moving last_activity items to be stored in the activity database, the
'members' component now has activity associated with it. However, these items
are not "real" activity items, in the sense that you would want to query them
when pulling up an activity stream. BP core has excluded these items from
general activity queries elsewhere. But in BP_Activity_Activity::get_registered_components(),
we continued to return the members component, even when the only activity
items associated with it were of the 'last_activity' variety. Though BP does
not natively use this method anymore, it did break some plugins that were
expecting a more sanitized list of components.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5519">#5519</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkteststestcasesactivityclassBP_Activity_Activityphp">trunk/tests/testcases/activity/class.BP_Activity_Activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (8248 => 8249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2014-04-06 19:30:35 UTC (rev 8248)
+++ trunk/bp-activity/bp-activity-classes.php 2014-04-07 17:33:26 UTC (rev 8249)
</span><span class="lines">@@ -1105,13 +1105,25 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get a list of components that have recorded activity associated with them
</del><ins>+ * Get a list of components that have recorded activity associated with them.
</ins><span class="cx"> *
</span><ins>+ * @param bool $skip_last_activity If true, components will not be
+ * included if the only activity type associated with them is
+ * 'last_activity'. (Since 2.0.0, 'last_activity' is stored in
+ * the activity table, but these items are not full-fledged
+ * activity items.) Default: true.
</ins><span class="cx"> * @return array List of component names.
</span><span class="cx"> */
</span><del>- public static function get_recorded_components() {
</del><ins>+ public static function get_recorded_components( $skip_last_activity = true ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><del>- return $wpdb->get_col( "SELECT DISTINCT component FROM {$bp->activity->table_name} ORDER BY component ASC" );
</del><ins>+
+ if ( $skip_last_activity ) {
+ $components = $wpdb->get_col( "SELECT DISTINCT component FROM {$bp->activity->table_name} WHERE action != '' AND action != 'last_activity' ORDER BY component ASC" );
+ } else {
+ $components = $wpdb->get_col( "SELECT DISTINCT component FROM {$bp->activity->table_name} ORDER BY component ASC" );
+ }
+
+ return $components;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkteststestcasesactivityclassBP_Activity_Activityphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/activity/class.BP_Activity_Activity.php (8248 => 8249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/activity/class.BP_Activity_Activity.php 2014-04-06 19:30:35 UTC (rev 8248)
+++ trunk/tests/testcases/activity/class.BP_Activity_Activity.php 2014-04-07 17:33:26 UTC (rev 8249)
</span><span class="lines">@@ -443,6 +443,105 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * @group get_recorded_components
+ */
+ public function test_get_recorded_components_skip_last_activity_false() {
+ $a1 = $this->factory->activity->create( array(
+ 'component' => 'members',
+ 'action' => 'last_activity',
+ ) );
+ $a2 = $this->factory->activity->create( array(
+ 'component' => 'groups',
+ 'action' => 'created_group',
+ ) );
+ $a3 = $this->factory->activity->create( array(
+ 'component' => 'friends',
+ 'action' => 'friendship_accepted',
+ ) );
+
+ $found = BP_Activity_Activity::get_recorded_components( false );
+ sort( $found );
+
+ $this->assertSame( array( 'friends', 'groups', 'members' ), BP_Activity_Activity::get_recorded_components( false ) );
+ }
+
+ /**
+ * @group get_recorded_components
+ */
+ public function test_get_recorded_components_skip_last_activity_true_filter_empty_component() {
+ $a1 = $this->factory->activity->create( array(
+ 'component' => 'members',
+ 'action' => 'last_activity',
+ ) );
+ $a2 = $this->factory->activity->create( array(
+ 'component' => 'groups',
+ 'action' => 'created_group',
+ ) );
+ $a3 = $this->factory->activity->create( array(
+ 'component' => 'friends',
+ 'action' => 'friendship_accepted',
+ ) );
+
+ $found = BP_Activity_Activity::get_recorded_components( true );
+ sort( $found );
+
+ $this->assertSame( array( 'friends', 'groups' ), BP_Activity_Activity::get_recorded_components() );
+ }
+
+ /**
+ * @group get_recorded_components
+ */
+ public function test_get_recorded_components_skip_last_activity_true_members_component_not_empty() {
+ $a1 = $this->factory->activity->create( array(
+ 'component' => 'members',
+ 'action' => 'last_activity',
+ ) );
+ $a2 = $this->factory->activity->create( array(
+ 'component' => 'groups',
+ 'action' => 'created_group',
+ ) );
+ $a3 = $this->factory->activity->create( array(
+ 'component' => 'friends',
+ 'action' => 'friendship_accepted',
+ ) );
+ $a4 = $this->factory->activity->create( array(
+ 'component' => 'members',
+ 'action' => 'foo',
+ ) );
+
+ $found = BP_Activity_Activity::get_recorded_components( true );
+ sort( $found );
+
+ $this->assertSame( array( 'friends', 'groups', 'members' ), BP_Activity_Activity::get_recorded_components() );
+ }
+
+ /**
+ * @group get_recorded_components
+ */
+ public function test_get_recorded_components_skip_last_activity_true_la_in_multiple_components() {
+ $a1 = $this->factory->activity->create( array(
+ 'component' => 'members',
+ 'action' => 'last_activity',
+ ) );
+ $a2 = $this->factory->activity->create( array(
+ 'component' => 'groups',
+ 'action' => 'created_group',
+ ) );
+ $a3 = $this->factory->activity->create( array(
+ 'component' => 'friends',
+ 'action' => 'friendship_accepted',
+ ) );
+ $a4 = $this->factory->activity->create( array(
+ 'component' => 'groups',
+ 'action' => 'last_activity',
+ ) );
+
+ $found = BP_Activity_Activity::get_recorded_components( true );
+ sort( $found );
+
+ $this->assertSame( array( 'friends', 'groups', ), BP_Activity_Activity::get_recorded_components() );
+ }
+ /**
</ins><span class="cx"> * @group activity_action
</span><span class="cx"> */
</span><span class="cx"> public function test_instantiated_action_with_dynamic_callback() {
</span></span></pre>
</div>
</div>
</body>
</html>