Changeset 11421 for trunk/src/bp-templates/bp-legacy/buddypress-functions.php

Timestamp:

02/08/2017 08:30:06 PM (8 years ago)

Author:

boonebgorges

Message:

When parsing directory AJAX querystring, don't skip 'type' param when Activity is disabled.

Introduced in [11419].

Props r-a-y.
See #7440.

File:

• trunk/src/bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)

trunk/src/bp-templates/bp-legacy/buddypress-functions.php

@@ -687 +687 @@
 
     // Activity stream filtering on action.
-    if ( bp_is_active( 'activity' ) && ! empty( $_BP_COOKIE['bp-' . $object . '-filter'] ) && '-1' != $_BP_COOKIE['bp-' . $object . '-filter'] ) {
+    if ( ! empty( $_BP_COOKIE['bp-' . $object . '-filter'] ) && '-1' != $_BP_COOKIE['bp-' . $object . '-filter'] ) {
         $qs[] = 'type=' . $_BP_COOKIE['bp-' . $object . '-filter'];
 
-        $actions = bp_activity_get_actions_for_context();
-        foreach ( $actions as $action ) {
-            if ( $action['key'] === $_BP_COOKIE['bp-' . $object . '-filter'] ) {
-                $qs[] = 'action=' . $_BP_COOKIE['bp-' . $object . '-filter'];
+        if ( bp_is_active( 'activity' ) ) {
+            $actions = bp_activity_get_actions_for_context();
+            foreach ( $actions as $action ) {
+                if ( $action['key'] === $_BP_COOKIE['bp-' . $object . '-filter'] ) {
+                    $qs[] = 'action=' . $_BP_COOKIE['bp-' . $object . '-filter'];
+                }
             }
         }