From f811f5aeb996958339b3af6ead8b8626324d02a1 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Wed, 21 Jul 2004 08:33:23 +0000
Subject: [PATCH] =?UTF-8?q?oubli=20de=20demande=20du=20champ=20=C3=A0=20My?=
=?UTF-8?q?SQL=20en=20cas=20de=20doublons=20(JLB)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
inc-calcul-squel.php3 | 15 ++++++++-------
inc-vrac-squel.php3 | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/inc-calcul-squel.php3 b/inc-calcul-squel.php3
index 5d56dabca5..a6948e3222 100644
--- a/inc-calcul-squel.php3
+++ b/inc-calcul-squel.php3
@@ -80,8 +80,9 @@ function calculer_boucle($id_boucle, &$boucles)
if ($x = $PileRow[$SP]["lang"]) $GLOBALS["spip_lang"] = $x;')) .
$invalide .
((!$boucle->doublons) ? "" :
- ("\n\t\t\$doublons['$type_boucle'] .= ','. \$PileRow[\$SP]['" .
- $primary_key . "'];")).
+ ("\n\t\t\$doublons['$type_boucle'] .= ','. " .
+ index_pile($id_boucle, $primary_key, $boucles) .
+ ";")).
$corps .
(($return == "''") ? "" :
((!$boucle->separateur) ?
@@ -127,7 +128,7 @@ function calculer_boucle($id_boucle, &$boucles)
$boucle->total_parties,
$id_boucle) :
((!$boucle->numrows) ? '' : "
- \$PileNum['$id_boucle'] = @spip_num_rows(\$result);")) .
+ \$Numrows['$id_boucle'] = @spip_num_rows(\$result);")) .
((!$flag_cpt) ? '' : "\n\t\$compteur_boucle = 0;") .
((!$corps) ? "" :
(
@@ -183,7 +184,7 @@ function calculer_parties($partie, $mode_partie, $total_parties, $id_boucle)
$fin_boucle -= ' .
($partie - $total_parties)) .
';')) . '
- $PileNum[$SP] = $fin_boucle - $debut_boucle + 1;');
+ $Numrows[$SP] = $fin_boucle - $debut_boucle + 1;');
}
@@ -236,7 +237,7 @@ function calculer_liste($tableau, $prefix, $id_boucle, $niv, &$boucles, $id_mere
$c = $prefix .
ereg_replace("-","_", $nom) .
- '($Cache, $PileRow, $doublons, $PileNum, $SP)';
+ '($Cache, $PileRow, $doublons, $Numrows, $SP)';
$m = "";
} else {
list($c,$m) =
@@ -388,13 +389,13 @@ function calculer_squelette($squelette, $nom, $gram) {
foreach($boucles as $id => $boucle)
{
$code .= "\n\nfunction $nom" . ereg_replace("-","_",$id) .
- '(&$Cache, &$PileRow, &$doublons, &$PileNum, $SP) {' .
+ '(&$Cache, &$PileRow, &$doublons, &$Numrows, $SP) {' .
$boucle->return .
"\n}\n";
}
}
return $code . '
-function ' . $nom . '($Cache, $PileRow, $doublons, $PileNum="", $SP=0)
+function ' . $nom . '($Cache, $PileRow, $doublons, $Numrows="", $SP=0)
{
' .
$corps . "\n \$t0 = " . $return . ';
diff --git a/inc-vrac-squel.php3 b/inc-vrac-squel.php3
index 63ef220dfb..b493b0b9d9 100644
--- a/inc-vrac-squel.php3
+++ b/inc-vrac-squel.php3
@@ -128,7 +128,7 @@ function calculer_champ_divers($fonctions, $nom_champ, $id_boucle, &$boucles, $i
include_local("inc-debug-squel.php3");
erreur_squelette(_L("Champ #TOTAL_BOUCLE hors boucle"), '', $id_boucle);
}
- $code = "\$PileNum[$id_mere]";
+ $code = "\$Numrows['$id_mere']";
$boucles[$id_mere]->numrows = true;
break;
--
GitLab