[Mantisbt-cvs] mantisbt/core filter_api.php,1.134,1.135

[Glenn H. <thr...@us...>]

Update of /cvsroot/mantisbt/mantisbt/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31792/core

Modified Files:
	filter_api.php 
Log Message:
fix for saved filters from rc3 and rc4
  - definitions of [any] and any not properly translated


Index: filter_api.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/filter_api.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- filter_api.php	8 Jan 2006 16:39:41 -0000	1.134
+++ filter_api.php	15 Jan 2006 02:30:20 -0000	1.135
@@ -497,7 +497,7 @@
 		# profile
 		$t_any_found = false;
 		foreach( $t_filter['show_profile'] as $t_filter_member ) {
-				if ( ( META_FILTER_ANY == $t_filter_member ) || ( 0 === $t_filter_member ) ) {
+				if ( ( META_FILTER_ANY == $t_filter_member ) || ( is_numeric( $t_filter_member ) ) ) {
 				$t_any_found = true;
 			}
 		}
@@ -2577,12 +2577,10 @@
 				$t_checked_array = array();
 				foreach ( $p_filter_arr[$t_multi_field_name] as $t_filter_value ) {
 					$t_filter_value = stripslashes( $t_filter_value );
-					if ( ( 5 <= $t_cookie_vers ) && 
-							( ( $t_filter_value === 'any' ) || ( $t_filter_value === '[any]' ) ) ) {
+					if ( ( $t_filter_value === 'any' ) || ( $t_filter_value === '[any]' ) ) {
 						$t_filter_value = META_FILTER_ANY;
 					}
-					if ( ( 5 <= $t_cookie_vers ) && 
-							( ( $t_filter_value === 'none' ) || ( $t_filter_value === '[none]' ) ) ) {
+					if ( ( $t_filter_value === 'none' ) || ( $t_filter_value === '[none]' ) ) {
 						$t_filter_value = META_FILTER_NONE;
 					}
 					if ( 'string' == $t_multi_field_type ) {
@@ -2608,7 +2606,7 @@
 					$t_checked_array = array();
 					foreach ( $p_filter_arr['custom_fields'][$t_cfid] as $t_filter_value ) {
 						$t_filter_value = stripslashes( $t_filter_value );
-						if ( ( 5 == $t_cookie_vers ) && ( ( $t_filter_value === 'any' ) || ( $t_filter_value === '[any]' ) ) ) {
+						if ( ( $t_filter_value === 'any' ) || ( $t_filter_value === '[any]' ) ) {
 							$t_filter_value = META_FILTER_ANY;
 						}
 						$t_checked_array[] = db_prepare_string( $t_filter_value );