From de1c928ab1929c6fc34bdd5c3a6e1b1046bcf5f2 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Mon, 6 Jun 2005 11:08:08 +0000
Subject: [PATCH] champ param pas toujours un tableau (Pierre Andrews)
---
inc-compilo-api.php3 | 2 +-
inc-compilo.php3 | 8 +++++---
inc-public.php3 | 2 ++
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/inc-compilo-api.php3 b/inc-compilo-api.php3
index ce7fab30d8..5db0f6c8d2 100644
--- a/inc-compilo-api.php3
+++ b/inc-compilo-api.php3
@@ -76,7 +76,7 @@ class Boucle {
class Critere {
var $op;
var $not;
- var $param;
+ var $param = array();
}
class Champ {
diff --git a/inc-compilo.php3 b/inc-compilo.php3
index f05b5f72f0..10231e8417 100644
--- a/inc-compilo.php3
+++ b/inc-compilo.php3
@@ -499,10 +499,12 @@ function code_boucle($boucle, $id, $nom, $sourcefile)
$s = $c->apres ;
if ($s)
$s = ($s . $c->texte . $s);
- else
+ else {
// faudrait decompiler aussi les balises...
- foreach ($param[1] as $c)
- $s .= ($c->type == 'texte') ? $c->texte : '#...';
+ if (is_array($t = $param[1]))
+ foreach ($t as $c)
+ $s .= ($c->type == 'texte') ? $c->texte : '#...';
+ }
$pretty .= ' {' . $s . '}';
}
diff --git a/inc-public.php3 b/inc-public.php3
index a62bf834b8..54dfb55c35 100644
--- a/inc-public.php3
+++ b/inc-public.php3
@@ -75,6 +75,8 @@ if (defined("_INC_PUBLIC")) {
}
// Passer la main au debuggueur le cas echeant
+ // (depuis le forcage du recalcul du squelette,
+ // inc-calcul doit le faire avant: ce code me semble inutile)
if ($var_mode == 'debug') {
include_ecrire("inc_debug_sql.php3");
debug_dumpfile('',$var_mode_objet,$var_mode_affiche);
--
GitLab