Fix #14735: Permalink does not work when using "Match Type"

mantisbt · Sep 24, 2012 · cc60613 · cc60613
1 parent 6bd719a
commit cc60613
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/config_filter_defaults_inc.php b/config_filter_defaults_inc.php
@@ -107,4 +107,5 @@
     define( 'FILTER_SEARCH_RELATIONSHIP_BUG', 'relationship_bug' );
     define( 'FILTER_SEARCH_TAG_STRING', 'tag_string' );
     define( 'FILTER_SEARCH_TAG_SELECT', 'tag_select' );
+    define( 'FILTER_SEARCH_MATCH_TYPE', 'match_type');
 
diff --git a/core/filter_api.php b/core/filter_api.php
@@ -253,6 +253,8 @@ function filter_get_url( $p_custom_filter ) {
 		$t_query[] = filter_encode_field_and_value( FILTER_SEARCH_TAG_SELECT, $p_custom_filter[FILTER_PROPERTY_TAG_SELECT] );
 	}
 
+	$t_query[] = filter_encode_field_and_value( FILTER_SEARCH_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
@@ -73,6 +73,7 @@
 	$my_filter[FILTER_PROPERTY_OS_BUILD] = gpc_get_string_array( FILTER_SEARCH_OS_BUILD, META_FILTER_ANY );
 	$my_filter[FILTER_PROPERTY_VIEW_STATE_ID] = gpc_get_string_array( FILTER_SEARCH_VIEW_STATE_ID, META_FILTER_ANY );
 	$my_filter[FILTER_PROPERTY_PRODUCT_VERSION] = gpc_get_string_array( FILTER_SEARCH_PRODUCT_VERSION, META_FILTER_ANY );
+	$my_filter[FILTER_PROPERTY_MATCH_TYPE] = gpc_get_string ( FILTER_SEARCH_MATCH_TYPE, FILTER_MATCH_ALL );
 
 	// Filtering by Date
 	$my_filter[FILTER_PROPERTY_FILTER_BY_DATE] = gpc_get_bool( FILTER_SEARCH_FILTER_BY_DATE );