<!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][11356] trunk: Discard activity filter values that are invalid for the current context.</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/11356">11356</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/11356","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-12-29 19:38:58 +0000 (Thu, 29 Dec 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'>Discard activity filter values that are invalid for the current context.
Activity filters are stored in a cookie that persists across
activity pages. But some filter values are not valid in all contexts,
such as `new_member` (valid in the sitewide feed, but not in a group).
This changeset ensures that filter values sent via AJAX are discarded
if they aren't valid in the current context.
Props lakrisgubben.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4062">#4062</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityfunctionsphp">trunk/src/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunksrcbpactivitybpactivitytemplatephp">trunk/src/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressfunctionsphp">trunk/src/bp-templates/bp-legacy/buddypress-functions.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestcasesactivityfunctionsbpActivityGetActionsForContextphp">trunk/tests/phpunit/testcases/activity/functions/bpActivityGetActionsForContext.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2016-12-29 03:49:42 UTC (rev 11355)
+++ trunk/src/bp-activity/bp-activity-functions.php 2016-12-29 19:38:58 UTC (rev 11356)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -839,6 +839,63 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'bp_activity_get_types', $actions );
</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">+/**
+ * Gets the current activity context.
+ *
+ * The "context" is the current view type, corresponding roughly to the
+ * current component. Use this context to determine which activity actions
+ * should be whitelisted for the filter dropdown.
+ *
+ * @since 2.8.0
+ *
+ * @return string Activity context. 'member', 'member_groups', 'group', 'activity'.
+ */
+function bp_activity_get_current_context() {
+ // On member pages, default to 'member', unless this is a user's Groups activity.
+ if ( bp_is_user() ) {
+ if ( bp_is_active( 'groups' ) && bp_is_current_action( bp_get_groups_slug() ) ) {
+ $context = 'member_groups';
+ } else {
+ $context = 'member';
+ }
+
+ // On individual group pages, default to 'group'.
+ } elseif ( bp_is_active( 'groups' ) && bp_is_group() ) {
+ $context = 'group';
+
+ // 'activity' everywhere else.
+ } else {
+ $context = 'activity';
+ }
+
+ return $context;
+}
+
+/**
+ * Gets a flat list of activity actions compatible with a given context.
+ *
+ * @since 2.8.0
+ *
+ * @param string $context Optional. Name of the context. Defaults to the current context.
+ * @return array
+ */
+function bp_activity_get_actions_for_context( $context = '' ) {
+ if ( ! $context ) {
+ $context = bp_activity_get_current_context();
+ }
+
+ $actions = array();
+ foreach ( bp_activity_get_actions() as $component_actions ) {
+ foreach ( $component_actions as $component_action ) {
+ if ( in_array( $context, (array) $component_action['context'], true ) ) {
+ $actions[] = $component_action;
+ }
+ }
+ }
+
+ return $actions;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** Favorites ****************************************************************/
</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="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 2016-12-29 03:49:42 UTC (rev 11355)
+++ trunk/src/bp-activity/bp-activity-template.php 2016-12-29 19:38:58 UTC (rev 11356)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3800,45 +3800,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string HTML for <option> values.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_get_activity_show_filters( $context = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Set default context based on current page.
- if ( empty( $context ) ) {
-
- // On member pages, default to 'member', unless this
- // is a user's Groups activity.
- if ( bp_is_user() ) {
- if ( bp_is_active( 'groups' ) && bp_is_current_action( bp_get_groups_slug() ) ) {
- $context = 'member_groups';
- } else {
- $context = 'member';
- }
-
- // On individual group pages, default to 'group'.
- } elseif ( bp_is_active( 'groups' ) && bp_is_group() ) {
- $context = 'group';
-
- // 'activity' everywhere else.
- } else {
- $context = 'activity';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filters = array();
+ $actions = bp_activity_get_actions_for_context( $context );
+ foreach ( $actions as $action ) {
+ // Friends activity collapses two filters into one.
+ if ( in_array( $action['key'], array( 'friendship_accepted', 'friendship_created' ) ) ) {
+ $action['key'] = 'friendship_accepted,friendship_created';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filters = array();
-
- // Walk through the registered actions, and prepare an the
- // select box options.
- foreach ( bp_activity_get_actions() as $actions ) {
- foreach ( $actions as $action ) {
- if ( ! in_array( $context, (array) $action['context'] ) ) {
- continue;
- }
-
- // Friends activity collapses two filters into one.
- if ( in_array( $action['key'], array( 'friendship_accepted', 'friendship_created' ) ) ) {
- $action['key'] = 'friendship_accepted,friendship_created';
- }
-
- $filters[ $action['key'] ] = $action['label'];
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filters[ $action['key'] ] = $action['label'];
</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>
<a id="trunksrcbptemplatesbplegacybuddypressfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress-functions.php 2016-12-29 03:49:42 UTC (rev 11355)
+++ trunk/src/bp-templates/bp-legacy/buddypress-functions.php 2016-12-29 19:38:58 UTC (rev 11356)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -687,8 +687,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Activity stream filtering on action.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_BP_COOKIE['bp-' . $object . '-filter'] ) && '-1' != $_BP_COOKIE['bp-' . $object . '-filter'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $qs[] = 'type=' . $_BP_COOKIE['bp-' . $object . '-filter'];
- $qs[] = 'action=' . $_BP_COOKIE['bp-' . $object . '-filter'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actions = bp_activity_get_actions_for_context();
+ foreach ( $actions as $action ) {
+ if ( $action['key'] === $_BP_COOKIE['bp-' . $object . '-filter'] ) {
+ $qs[] = 'type=' . $_BP_COOKIE['bp-' . $object . '-filter'];
+ $qs[] = 'action=' . $_BP_COOKIE['bp-' . $object . '-filter'];
+ }
+ }
</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"> if ( ! empty( $_BP_COOKIE['bp-' . $object . '-scope'] ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestcasesactivityfunctionsbpActivityGetActionsForContextphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/testcases/activity/functions/bpActivityGetActionsForContext.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/activity/functions/bpActivityGetActionsForContext.php (rev 0)
+++ trunk/tests/phpunit/testcases/activity/functions/bpActivityGetActionsForContext.php 2016-12-29 19:38:58 UTC (rev 11356)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,64 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group activity
+ */
+class BP_Tests_Activity_Functions_BpActivityGetActionsForContext extends BP_UnitTestCase {
+ public function setUp() {
+ parent::setUp();
+
+ $bp = buddypress();
+
+ $this->reset_actions = clone $bp->activity->actions;
+ $bp->activity->actions = new stdClass();
+
+ $this->reset_actions_sorted = ! empty( $bp->activity->actions_sorted );
+ unset( $bp->activity->actions_sorted );
+ }
+
+ public function tearDown() {
+ $bp = buddypress();
+
+ $bp->activity->actions = $this->reset_actions;
+
+ if ( $this->reset_actions_sorted ) {
+ $bp->activity->actions_sorted = true;
+ } else {
+ unset( $bp->activity->actions_sorted );
+ }
+
+ parent::tearDown();
+ }
+
+ public function test_should_include_actions_registered_for_context() {
+ bp_activity_set_action(
+ 'foo',
+ 'new_foo',
+ 'Did a foo',
+ '',
+ '',
+ array( 'member' ),
+ 10
+ );
+
+ $actions = bp_activity_get_actions_for_context( 'member' );
+ $keys = wp_list_pluck( $actions, 'key' );
+ $this->assertContains( 'new_foo', $keys );
+ }
+
+ public function test_should_ignore_actions_not_registered_for_context() {
+ bp_activity_set_action(
+ 'foo',
+ 'new_foo',
+ 'Did a foo',
+ '',
+ '',
+ array( 'member' ),
+ 10
+ );
+
+ $actions = bp_activity_get_actions_for_context( 'group' );
+ $keys = wp_list_pluck( $actions, 'key' );
+ $this->assertNotContains( 'new_foo', $keys );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>