diff --git a/inc-criteres.php3 b/inc-criteres.php3
index e98b65fd75f4b69f3353294b6b1ea64939db0981..77ca593c301828f21cbcf6197db2762d03cc0546 100644
--- a/inc-criteres.php3
+++ b/inc-criteres.php3
@@ -550,11 +550,6 @@ function calculer_critere_DEFAUT($idb, &$boucles, $crit) {
 		else $col = "$col_table.$col";
 	}
 	if (strtoupper($op) == 'IN') {
-	  // traitement special d'une suite de valeurs
-	  foreach ($val as $k => $v) {
-	    if (!ereg("^$", $v))
-	      $val[$k] = "\n'\" . addslashes(" . ($v) . ") . \"'";
-	  }
 	  $val = join(', ',$val);
 
 	  if (!ereg("^ *\(.*) *$", $val)) $val = "($val)";
diff --git a/inc-html-squel.php3 b/inc-html-squel.php3
index 7046d83ecffa9d4f3ef46bd215ae87e805e1268d..9045040f3da58972f0babde43b1f8f90d477e164 100644
--- a/inc-html-squel.php3
+++ b/inc-html-squel.php3
@@ -183,7 +183,7 @@ function phraser_args($texte, $fin, $sep, $result, &$pointeur_champ) {
 		else if ($args[0] == "'")
 			preg_match ("/^(')([^']*)(')(.*)$/ms", $args, $regs);
 		else {
-		  preg_match("/^( *)([^,}]*)([,}$fin].*)$/ms", $args, $regs);
+		  preg_match("/^([[:space:]]*)([^,}]*)([,}$fin].*)$/ms", $args, $regs);
 		  if (!strlen($regs[2]))
 		    {
 		      erreur_squelette(_T('zbug_info_erreur_squelette'), $args);
@@ -315,7 +315,7 @@ function phraser_criteres($params, &$result) {
 			     !== false))
 			  $op = ',';
 			else {
-			  ereg("^([a-zA-Z][a-zA-Z0-9]*) *(.*)$", $param, $m);
+			  preg_match("/^([a-zA-Z][a-zA-Z0-9]*)[[:space:]]*(.*)$/ms", $param, $m);
 			  $op = $m[1];
 			  $v[1][0]->texte = $m[2];
 			}
@@ -364,7 +364,7 @@ function phraser_criteres($params, &$result) {
 			      $result->hash = true;
 			  if (ereg('^([0-9-]+)(/)([0-9-]+)$', $param, $m)) {
 			    $crit = phraser_critere_infixe($m[1], $m[3],$v, '/', '', '');
-			  } elseif (ereg('^(`?[A-Za-z_]+\(?[A-Za-z_]*\)?`?) *(\??)(!?)(<=?|>=?|==?|IN) *"?([^<>=!"]*)"?$', $param, $m)) {
+			  } elseif (ereg('^(`?[A-Za-z_]+\(?[A-Za-z_]*\)?`?)[[:space:]]*(\??)(!?)(<=?|>=?|==?|IN)[[:space:]]*"?([^<>=!"]*)"?$', $param, $m)) {
 			    $crit = phraser_critere_infixe($m[1], $m[5],$v,
 							   (($m[1] == 'lang_select') ? $m[1] : trim($m[4])),
 							   $m[3], $m[2]);