Update of /home/spip-cvs/spip
In directory alan:/tmp/cvs-serv30881
Modified Files:
inc-html-squel.php3
Log Message:
bug sur certains emboîtements de champs étendus
Index: inc-html-squel.php3
RCS file: /home/spip-cvs/spip/inc-html-squel.php3,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- inc-html-squel.php3 2 Sep 2004 20:40:53 -0000 1.12
+++ inc-html-squel.php3 3 Sep 2004 07:57:10 -0000 1.13
@@ -99,19 +99,14 @@
return parser_champs_interieurs($debut, $sep, array());
}
-## TODO: cette fonction du parser buggue avec un triple emboitement
-## [x[y[z(#DATE|jour)t](#DATE|mois)u](#DATE|annee)v]
+
function parser_champs_exterieurs($debut, $sep, $nested) {
- #echo "DEBUT: $debut<br>\nSEP:$sep<br>\n";
$res = array();
foreach (split("%$sep",$debut) as $v) {
if (!ereg("^([0-9]+)@(.*)$", $v, $m))
$res = array_merge($res, parser_champs($v));
else if ($m[2] == 'Object') {
$res[]= $nested[$m[1]];
- #echo "NESTED : ";
- #var_dump($nested[$m[1]]);
- #echo "<br>\n";
} else
$res = array_merge($res, parser_champs($m[2]));
}
@@ -149,7 +144,7 @@
$texte = $regs[8];
}
if ($texte)
- $result[$i++] = $texte;
+ $result[$i] = $texte;
$x ='';
$j=0;