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

rombert · rombert · commit a93121b97ed4 · 2012-09-24T22:36:51.000+03:00
Conflicts:
	config_filter_defaults_inc.php
	search.php
diff --git 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
@@ -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 );

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,8 @@ function filter_get_url( $p_custom_filter ) {`
`279`	`279`	`$t_query[] = filter_encode_field_and_value( FILTER_PROPERTY_TAG_SELECT, $p_custom_filter[FILTER_PROPERTY_TAG_SELECT] );`
`280`	`280`	`}`
`281`	`281`
	`282`	`+ $t_query[] = filter_encode_field_and_value( FILTER_PROPERTY_MATCH_TYPE, $p_custom_filter[FILTER_PROPERTY_MATCH_TYPE] );`
	`283`	`+`
`282`	`284`	`if( isset( $p_custom_filter['custom_fields'] ) ) {`
`283`	`285`	`foreach( $p_custom_filter['custom_fields'] as $t_custom_field_id => $t_custom_field_values ) {`
`284`	`286`	`if( !filter_field_is_any( $t_custom_field_values ) ) {`