Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix #14735: Permalink does not work when using "Match Type"
Conflicts:
	config_filter_defaults_inc.php
	search.php
  • Loading branch information
rombert committed Sep 24, 2012
1 parent d3617a6 commit a93121b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions core/filter_api.php
Expand Up @@ -279,6 +279,8 @@ function filter_get_url( $p_custom_filter ) {
$t_query[] = filter_encode_field_and_value( FILTER_PROPERTY_TAG_SELECT, $p_custom_filter[FILTER_PROPERTY_TAG_SELECT] );
}

$t_query[] = filter_encode_field_and_value( FILTER_PROPERTY_MATCH_TYPE, $p_custom_filter[FILTER_PROPERTY_MATCH_TYPE] );

if( isset( $p_custom_filter['custom_fields'] ) ) {
foreach( $p_custom_filter['custom_fields'] as $t_custom_field_id => $t_custom_field_values ) {
if( !filter_field_is_any( $t_custom_field_values ) ) {
Expand Down
1 change: 1 addition & 0 deletions search.php
Expand Up @@ -89,6 +89,7 @@
$my_filter[FILTER_PROPERTY_OS_BUILD] = gpc_get_string_array( FILTER_PROPERTY_OS_BUILD, META_FILTER_ANY );
$my_filter[FILTER_PROPERTY_VIEW_STATE] = gpc_get_string_array( FILTER_PROPERTY_VIEW_STATE, META_FILTER_ANY );
$my_filter[FILTER_PROPERTY_VERSION] = gpc_get_string_array( FILTER_PROPERTY_VERSION, META_FILTER_ANY );
$my_filter[FILTER_PROPERTY_MATCH_TYPE] = gpc_get_string ( FILTER_PROPERTY_MATCH_TYPE, FILTER_MATCH_ALL );

// Filtering by Date
$my_filter[FILTER_PROPERTY_FILTER_BY_DATE] = gpc_get_bool( FILTER_PROPERTY_FILTER_BY_DATE );
Expand Down

0 comments on commit a93121b

Please sign in to comment.