Changeset 7860 for trunk/bp-activity/bp-activity-classes.php
- Timestamp:
- 02/12/2014 09:27:20 PM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-activity/bp-activity-classes.php
r7854 r7860 362 362 } 363 363 364 // Exclude 'last_activity' items unless the 'action' filter has 365 // been explicitly set 366 if ( empty( $filter['object'] ) ) { 367 $where_conditions[] = "a.type != 'last_activity'"; 368 } 369 364 370 // Filter the where conditions 365 371 $where_conditions = apply_filters( 'bp_activity_get_where_conditions', $where_conditions, $r, $select_sql, $from_sql, $join_sql ); … … 1063 1069 1064 1070 // split items at the comma 1065 $items_dirty = explode( ',', $items ); 1071 if ( ! is_array( $items ) ) { 1072 $items = explode( ',', $items ); 1073 } 1066 1074 1067 1075 // array of prepared integers or quoted strings … … 1069 1077 1070 1078 // clean up and format each item 1071 foreach ( $items _dirtyas $item ) {1079 foreach ( $items as $item ) { 1072 1080 // clean up the string 1073 1081 $item = trim( $item ); … … 1121 1129 if ( !empty( $filter_array['action'] ) ) { 1122 1130 $action_sql = BP_Activity_Activity::get_in_operator_sql( 'a.type', $filter_array['action'] ); 1123 if ( ! empty( $action_sql ) )1131 if ( ! empty( $action_sql ) ) 1124 1132 $filter_sql[] = $action_sql; 1125 1133 }
Note: See TracChangeset
for help on using the changeset viewer.