From de458d3a9ffed84431e98e897aaf6f904b6e79ce Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Mon, 27 Feb 2006 16:18:05 +0000
Subject: [PATCH] virer les clauses vides plutot que produire des 0=0 ineptes
---
ecrire/inc_db_mysql.php | 3 +++
ecrire/public/criteres.php | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/ecrire/inc_db_mysql.php b/ecrire/inc_db_mysql.php
index fbe30a76b1..3ee30eaa6d 100644
--- a/ecrire/inc_db_mysql.php
+++ b/ecrire/inc_db_mysql.php
@@ -77,6 +77,9 @@ function spip_mysql_select($select, $from, $where,
$sousrequete, $having,
$table, $id, $serveur) {
+ foreach($where as $k => $v)
+ { if (!$v) unset($where[$k]);}
+
$q = ($from ?("\nFROM " . join(",\n\t", $from)) : '')
. ($where ? ("\nWHERE " . join("\n\tAND ", $where)) : '')
. ($groupby ? "\nGROUP BY $groupby" : '')
diff --git a/ecrire/public/criteres.php b/ecrire/public/criteres.php
index ce9f53d955..94017f2b54 100644
--- a/ecrire/public/criteres.php
+++ b/ecrire/public/criteres.php
@@ -512,7 +512,7 @@ function calculer_critere_DEFAUT($idb, &$boucles, $crit)
$where :
("\".(" .
calculer_argument_precedent($idb, $col, $boucles) .
- "? \"$where\" : '0=0').\"");
+ "? (\"$where\") : '').\"");
}
function calculer_critere_infixe($idb, &$boucles, $crit) {
--
GitLab