Changeset 8429

Timestamp:

05/18/2014 07:28:01 PM (10 years ago)

Author:

boonebgorges

Message:

Check that Groups component is active before using bp_get_groups_slug() in bp_activity_get_show_filters()

Fixes #5637

Props imath

File:

• trunk/src/bp-activity/bp-activity-template.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-template.php

@@ -3397 +3397 @@
         // 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() ) {
-                switch ( bp_current_action() ) {
-                    case bp_get_groups_slug() :
-                        $context = 'member_groups';
-                        break;
-
-                    default :
-                        $context = 'member';
-                        break;
+                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'
             } else if ( bp_is_active( 'groups' ) && bp_is_group() ) {
                 $context = 'group';
+
+            // 'activity' everywhere else
             } else {
                 $context = 'activity';