From dba04a6860194a0b42fc15d7af5e95a9f45b5ee0 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Mon, 6 Jun 2005 13:38:29 +0000
Subject: [PATCH] =?UTF-8?q?[]=C2=A0et=20()=20dans=20des=20criteres=20sans?=
=?UTF-8?q?=20champ=20((A.=20Levy)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
inc-html-squel.php3 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/inc-html-squel.php3 b/inc-html-squel.php3
index 10fa80dde9..a9dc3a8fe3 100644
--- a/inc-html-squel.php3
+++ b/inc-html-squel.php3
@@ -179,12 +179,13 @@ function phraser_args($texte, $fin, $sep, $result, &$pointeur_champ) {
$args = ltrim(substr($suite,1));
$collecte = array();
while ($args && $args[0] != '}') {
+
if ($args[0] == '"')
preg_match ('/^(")([^"]*)(")(.*)$/ms', $args, $regs);
else if ($args[0] == "'")
preg_match ("/^(')([^']*)(')(.*)$/ms", $args, $regs);
else {
- preg_match("/^([[:space:]]*)([^,}]*)([,}$fin].*)$/ms", $args, $regs);
+ preg_match("/^([[:space:]]*)([^$fin,([{}]*([(\[{][^])}]*[])}])?[^$fin,}]*)([,}$fin].*)$/ms", $args, $regs);
if (!strlen($regs[2]))
{
erreur_squelette(_T('zbug_info_erreur_squelette'), $args);
--
GitLab