From a93121b97ed48b87dbcf94d7c809655cff2d2b11 Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Mon, 24 Sep 2012 22:36:51 +0300 Subject: [PATCH] Fix #14735: Permalink does not work when using "Match Type" Conflicts: config_filter_defaults_inc.php search.php --- core/filter_api.php | 2 ++ search.php | 1 + 2 files changed, 3 insertions(+) diff --git a/core/filter_api.php b/core/filter_api.php index be81c407cf..3feb3abd71 100644 --- a/core/filter_api.php +++ b/core/filter_api.php @@ -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 ) ) { diff --git a/search.php b/search.php index 7587b79a35..9a9f305842 100644 --- a/search.php +++ b/search.php @@ -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 );