From ab122e57041d81365850ae0940ef8ce6eab86391 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sat, 28 May 2005 13:22:17 +0000
Subject: [PATCH] accepter des champs SQL et des criteres comportant des
chiffres dans leur nom
---
inc-html-squel.php3 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/inc-html-squel.php3 b/inc-html-squel.php3
index 9045040f3d..8a2a659e48 100644
--- a/inc-html-squel.php3
+++ b/inc-html-squel.php3
@@ -364,11 +364,11 @@ function phraser_criteres($params, &$result) {
$result->hash = true;
if (ereg('^([0-9-]+)(/)([0-9-]+)$', $param, $m)) {
$crit = phraser_critere_infixe($m[1], $m[3],$v, '/', '', '');
- } elseif (ereg('^(`?[A-Za-z_]+\(?[A-Za-z_]*\)?`?)[[:space:]]*(\??)(!?)(<=?|>=?|==?|IN)[[:space:]]*"?([^<>=!"]*)"?$', $param, $m)) {
+ } elseif (ereg('^(`?[A-Za-z_][A-Za-z_0-9]*\(?[A-Za-z_]*\)?`?)[[:space:]]*(\??)(!?)(<=?|>=?|==?|IN)[[:space:]]*"?([^<>=!"]*)"?$', $param, $m)) {
$crit = phraser_critere_infixe($m[1], $m[5],$v,
(($m[1] == 'lang_select') ? $m[1] : trim($m[4])),
$m[3], $m[2]);
- } elseif (preg_match("/^([!]?)[[:space:]]*([a-z_]+)[[:space:]]*(\??)(.*)$/ism", $param, $m)) {
+ } elseif (preg_match("/^([!]?)[[:space:]]*([A-Za-z_][A-Za-z_0-9]*)[[:space:]]*(\??)(.*)$/ism", $param, $m)) {
// contient aussi les comparaisons implicites !
array_shift($v);
if ($m[4])
--
GitLab