Changeset 2487
- Timestamp:
- 01/31/2010 10:21:48 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-activity/bp-activity-templatetags.php
r2486 r2487 128 128 $object = false; 129 129 $primary_id = false; 130 $display_comments = 'threaded'; 130 131 131 132 /* User filtering */ … … 135 136 /* User activity scope filtering */ 136 137 if ( !empty( $user_id ) ) { 138 if ( empty( $bp->current_action ) || 'just-me' == $bp->current_action ) 139 $display_comments = 'stream'; 140 137 141 switch ( $bp->current_action ) { 138 142 case 'friends': … … 158 162 $search_terms = '@' . bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ); 159 163 $show_hidden = ( bp_is_my_profile() ) ? 1 : 0; 164 $display_comments = 'stream'; 160 165 break; 161 166 } … … 172 177 $include = $bp->action_variables[0]; 173 178 174 /* Support for basic filters in earlier BP versions. */175 if ( isset( $_GET['afilter'] ) )176 $filter = array( 'object' => $_GET['afilter'] );177 else178 $filter = array( 'user_id' => $user_id, 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id );179 180 179 /* Note: any params used for filtering can be a single value, or multiple values comma separated. */ 181 180 $defaults = array( 182 'display_comments' => 'threaded', // false for none, stream/threaded - show comments in the stream or threaded under items181 'display_comments' => $display_comments, // false for none, stream/threaded - show comments in the stream or threaded under items 183 182 'include' => $include, // pass an activity_id or string of ID's comma separated 184 183 'sort' => 'DESC', // sort DESC or ASC … … 200 199 201 200 $r = wp_parse_args( $args, $defaults ); 202 extract( $r , EXTR_SKIP);201 extract( $r ); 203 202 204 203 if ( $max ) { … … 206 205 $per_page = $max; 207 206 } 207 208 /* Support for basic filters in earlier BP versions. */ 209 if ( isset( $_GET['afilter'] ) ) 210 $filter = array( 'object' => $_GET['afilter'] ); 211 else 212 $filter = array( 'user_id' => $user_id, 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id ); 208 213 209 214 $activities_template = new BP_Activity_Template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden );
Note: See TracChangeset
for help on using the changeset viewer.