Changeset 5444
- Timestamp:
- 07/11/2014 09:58:49 PM (12 years ago)
- Location:
- trunk/src/includes/search
- Files:
-
- 2 edited
-
functions.php (modified) (2 diffs)
-
template.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/includes/search/functions.php
r5024 r5444 30 30 31 31 // Merge arguments 32 if ( ! empty( $new_args ) ) {32 if ( ! empty( $new_args ) ) { 33 33 $new_args = bbp_parse_args( $new_args, array(), 'search_query' ); 34 34 $query_args = array_merge( $query_args, $new_args ); … … 50 50 // Get search terms 51 51 $search_terms = bbp_get_search_terms(); 52 $retval = ! empty( $search_terms ) ? array( 's' => $search_terms ) : array();52 $retval = ! empty( $search_terms ) ? array( 's' => $search_terms ) : array(); 53 53 54 54 return apply_filters( 'bbp_get_search_query_args', $retval ); -
trunk/src/includes/search/template.php
r5433 r5444 307 307 308 308 // Append search terms 309 if ( ! empty( $search_terms ) ) {309 if ( ! empty( $search_terms ) ) { 310 310 $url = trailingslashit( $url ) . user_trailingslashit( urlencode( $search_terms ) ); 311 311 } … … 350 350 351 351 // Sanitize terms if they were passed in 352 if ( ! empty( $passed_terms ) ) {352 if ( ! empty( $passed_terms ) ) { 353 353 $search_terms = sanitize_title( $passed_terms ); 354 354 … … 359 359 360 360 // Trim whitespace and decode, or set explicitly to false if empty 361 $search_terms = ! empty( $search_terms ) ? urldecode( trim( $search_terms ) ) : false;361 $search_terms = ! empty( $search_terms ) ? urldecode( trim( $search_terms ) ) : false; 362 362 363 363 return apply_filters( 'bbp_get_search_terms', $search_terms, $passed_terms ); … … 435 435 $bbp = bbpress(); 436 436 437 if ( ! isset( $bbp->search_query->pagination_links ) || empty( $bbp->search_query->pagination_links ) ) {437 if ( ! isset( $bbp->search_query->pagination_links ) || empty( $bbp->search_query->pagination_links ) ) { 438 438 return false; 439 439 }
Note: See TracChangeset
for help on using the changeset viewer.