From 0ae1ccd878e46d9eba67f96bdf6b4f73b51cedfd Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sat, 14 May 2005 09:08:23 +0000
Subject: [PATCH] Imbrication des filtres, meme avec champs etendus
---
inc-compilo-index.php3 | 2 +-
inc-compilo.php3 | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/inc-compilo-index.php3 b/inc-compilo-index.php3
index 37b8381e3e..a234647a58 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 534f843a74..3299978203 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] :
--
GitLab