diff --git a/inc-compilo-index.php3 b/inc-compilo-index.php3 index 37b8381e3ed636732270103c262ccacb169bc377..a234647a5814d4c881701d123cd9cdcddc60aada 100644 --- a/inc-compilo-index.php3 +++ b/inc-compilo-index.php3 @@ -261,7 +261,7 @@ function compose_filtres($p, $code) $sep = ($fonc == '?' ? ':' : ','); $arglist = ""; foreach ($filtre as $arg) { - $arglist .= $sep . calculer_liste($arg, $p->descr, $p->boucles, $p->id_boucle); + $arglist .= $sep . calculer_liste($arg, $p->descr, $p->boucles, $p->id_boucle, $p->descr['niv']); } if (function_exists($fonc)) diff --git a/inc-compilo.php3 b/inc-compilo.php3 index 534f843a7482182138faf4fff31adb7d04b1b657..3299978203c55ad201ea87f20351c55fc63abd21 100644 --- a/inc-compilo.php3 +++ b/inc-compilo.php3 @@ -385,7 +385,7 @@ function calculer_liste($tableau, $descr, &$boucles, $id_boucle='', $niv=1) { if (!$tableau) return "''"; $codes = array(); $t = '$t' . $niv; - + $descr['niv'] = $niv; for ($i=0; $i<=$niv; $i++) $tab .= "\t"; foreach ($tableau as $p) { @@ -492,8 +492,8 @@ function calculer_liste($tableau, $descr, &$boucles, $id_boucle='', $niv=1) { $code = "(($t = $code) ?\n\t$tab($res) :\n\t$tab($altern))"; } - $codes[]= (!$commentaire ? $code : - ("/"."* $commentaire *"."/ " . $code)); + $codes[]= $code; +# (!$commentaire ? "" : ("/* $commentaire */ ") . $code); } // foreach return ((count($codes)==1) ? $codes[0] :