Update of /home/spip-cvs/spip
In directory alan:/tmp/cvs-serv19428
Modified Files:
inc-arg-squel.php3 inc-calcul_mysql3.php
Log Message:
Bug {id_rubrique!=43}{id_rubrique}
Index: inc-calcul_mysql3.php
RCS file: /home/spip-cvs/spip/inc-calcul_mysql3.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inc-calcul_mysql3.php 16 Jul 2004 07:20:01 -0000 1.1
+++ inc-calcul_mysql3.php 18 Jul 2004 14:19:44 -0000 1.2
@@ -38,7 +38,7 @@
$q = (!$sous ?
("\nSELECT\t". join(",\n\t", $s) . $q) :
("\nSELECT\tS_" . join(",\n\tS_", $s) .
- "\nFROM ($s,\n\tCOUNT(" . $sous .
+ "\nFROM\t(" . join(",\n\t", $s) . " ,\n\tCOUNT(" . $sous .
") AS compteur $q)\n AS S_$table\nWHERE compteur= " .
$cpt));
# spip_log("$id: $q");
Index: inc-arg-squel.php3
RCS file: /home/spip-cvs/spip/inc-arg-squel.php3,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- inc-arg-squel.php3 16 Jul 2004 22:45:52 -0000 1.6
+++ inc-arg-squel.php3 18 Jul 2004 14:19:44 -0000 1.7
@@ -243,13 +243,13 @@
if ($col_table) $col = "$col_table.$col";
$vu = 0;
- if (($op == '=') && ($boucle->where))
+ if (($op == '=') && (!$match[4]) && ($boucle->where))
{
// repe'rer un parame`tre re'pe'te' comme {id_mot=1}{id_mot=2}
// pour cre'er une sous-requete
foreach ($boucle->where as $k => $v)
{
- if (ereg(" *$col *(=|IN) *['\(](.*)['\)]",$v, $m)) {
+ if (ereg("^ *$col *(=|IN) *['\(](.*)['\)]",$v, $m)) {
$boucle->where[$k] = "$col IN ($m[2],$val)";
// espe'rons que c'est le meme !
$boucle->sous_requete = $col;