diff --git a/inc-text-squel.php3 b/inc-text-squel.php3 index 5efc83fead4cb5b92259ba482f1256d4321c1024..3625d4e832fb66ce3c5699a6d55e00c8eaf4163f 100644 --- a/inc-text-squel.php3 +++ b/inc-text-squel.php3 @@ -6,29 +6,26 @@ function calculer_inclure($fichier, $params, $id_boucle, &$boucles, $pi) { $criteres = ''; if ($params) { foreach($params as $param) { - if (eregi("^([_0-9a-zA-Z]+)[[:space:]]*(=[[:space:]]*([^}]+))?$", $param, $args)) { - $var = $args[1]; - $val = $args[3]; - + if (ereg("^([_0-9a-zA-Z]+)[[:space:]]*(=[[:space:]]*([^}]+))?$", $param, $args)) { + $var = $args[1]; + $val = $args[3]; // Cas de la langue : passer $spip_lang // et non table.lang (car depend de {lang_select}) - if ($var =='lang') { + if ($var =='lang') { if ($val) $l[] = "'\'lang\' => " . addslashes($val) . "'"; else $l[] = "'\'lang\' => \''.\$GLOBALS[spip_lang].'\''"; } - - else + else if ($val) $l[] = "'\'$var\' => " . addslashes($val) . "'"; else { $l[] = "'\'$var\' => \'' . addslashes(" . index_pile($id_boucle, $var, $boucles) . ") .'\''"; } - } + } + $criteres = ("' . " . join(".', '.\n",$l) . " . '"); } - if ($l) - $criteres = ("' ." . join(".', '.\n",$l) . ". '"); } return "\n'<". "?php