Changeset 9372
- Timestamp:
- 01/19/2015 06:14:47 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/bp-activity/bp-activity-classes.php
r9366 r9372 319 319 } 320 320 321 $ defaults =array(321 $r = wp_parse_args( $args, array( 322 322 'page' => 1, // The current page 323 323 'per_page' => 25, // Activity items per page … … 337 337 'update_meta_cache' => true, 338 338 'count_total' => false, 339 ); 340 $r = wp_parse_args( $args, $defaults ); 339 ) ); 341 340 342 341 // Select conditions … … 360 359 if ( ! empty( $scope_query['sql'] ) ) { 361 360 $where_conditions['scope_query_sql'] = $scope_query['sql']; 362 363 // No matches, so we should alter the SQL statement to match nothing364 } else {365 $where_conditions['scope_no_results'] = '0 = 1';366 361 } 367 362 … … 370 365 $r = self::array_replace_recursive( $r, $scope_query['override'] ); 371 366 } 367 372 368 // Advanced filtering 373 369 } elseif ( ! empty( $r['filter_query'] ) ) { 374 370 $filter_query = new BP_Activity_Query( $r['filter_query'] ); 375 if ( $sql = $filter_query->get_sql() ) { 371 $sql = $filter_query->get_sql(); 372 if ( ! empty( $sql ) ) { 376 373 $where_conditions['filter_query_sql'] = $sql; 377 374 } … … 403 400 404 401 // Hide Hidden Items? 405 if ( ! $r['show_hidden'] ) 402 if ( ! $r['show_hidden'] ) { 406 403 $where_conditions['hidden_sql'] = "a.hide_sitewide = 0"; 404 } 407 405 408 406 // Exclude specified items … … 616 614 617 615 if ( !empty( $r['max'] ) ) { 618 if ( (int) $total_activities > (int) $r['max'] ) 616 if ( (int) $total_activities > (int) $r['max'] ) { 619 617 $total_activities = $r['max']; 618 } 620 619 } 621 620 -
trunk/src/bp-activity/bp-activity-filters.php
r9351 r9372 678 678 $favs = bp_activity_get_user_favorites( $filter['user_id'] ); 679 679 if ( empty( $favs ) ) { 680 return $retval;680 $favs = array( 0 ); 681 681 } 682 682 -
trunk/src/bp-friends/bp-friends-activity.php
r9351 r9372 243 243 244 244 if ( empty( $friends ) ) { 245 return $retval;245 $friends = array( 0 ); 246 246 } 247 247 -
trunk/src/bp-groups/bp-groups-activity.php
r9351 r9372 247 247 248 248 if ( empty( $groups['groups'] ) ) { 249 return $retval;249 $groups = array( 'groups' => 0 ); 250 250 } 251 251 -
trunk/tests/phpunit/testcases/activity/template.php
r9330 r9372 353 353 354 354 // Create a random activity 355 $ a1 = $this->factory->activity->create( array(355 $this->factory->activity->create( array( 356 356 'user_id' => $u1, 357 357 'type' => 'activity_update', … … 386 386 387 387 // Create a random activity 388 $ a1 = $this->factory->activity->create( array(388 $this->factory->activity->create( array( 389 389 'user_id' => $u1, 390 390 'type' => 'activity_update', … … 419 419 420 420 // Create a random activity 421 $ a1 = $this->factory->activity->create( array(421 $this->factory->activity->create( array( 422 422 'user_id' => $u1, 423 423 'type' => 'activity_update', … … 452 452 453 453 // Create a random activity 454 $ a1 = $this->factory->activity->create( array(454 $this->factory->activity->create( array( 455 455 'user_id' => $u1, 456 456 'type' => 'activity_update',
Note: See TracChangeset
for help on using the changeset viewer.