Changeset 2484 for trunk/bp-themes/bp-default/_inc/ajax.php

Timestamp:

01/30/2010 04:53:52 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1712

File:

• trunk/bp-themes/bp-default/_inc/ajax.php (modified) (3 diffs)

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -166 +166 @@
 add_action( 'wp_ajax_delete_activity', 'bp_dtheme_delete_activity' );
 
-function bp_dtheme_activity_loop( $scope = 'all', $filter = false, $query_string = false, $per_page = 20, $page = 1 ) {
+function bp_dtheme_activity_loop( $scope = false, $filter = false, $query_string = false, $per_page = 20, $page = 1 ) {
     global $bp;
 
@@ -174 +174 @@
             $query_string = 'user_id=' . $bp->displayed_user->id;
         } else {
-            /* Make sure a scope is set. */
-            if ( empty($scope) )
-                $type = 'all';
+            if ( !empty( $bp->groups->current_group ) )
+                $scope = 'all';
 
             $feed_url = site_url( BP_ACTIVITY_SLUG . '/feed/' );
@@ -217 +216 @@
 
         /* If we are viewing a group then filter the activity just for this group */
-        if ( $bp->groups->current_group ) {
+        if ( !empty( $bp->groups->current_group ) ) {
             $query_string .= '&object=' . $bp->groups->id . '&primary_id=' . $bp->groups->current_group->id;