From 2e3ed2451e816438a9f613d7675a26367ed88246 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sat, 4 Mar 2006 17:20:51 +0000
Subject: [PATCH] =?UTF-8?q?Contrairement=20=C3=A0=20ce=20que=20laisse=20cr?=
=?UTF-8?q?oire=20la=20doc=20Mysql,=20OFFSET=20n'est=20pas=20disponible=20?=
=?UTF-8?q?dans=20ses=20vieilles=20versions.=20On=20d=C3=A9fait=20donc=20l?=
=?UTF-8?q?es=20qq=20cas=20de=20[4713]=20o=C3=B9=20il=20n'=C3=A9tait=20pas?=
=?UTF-8?q?=20=C3=A0=200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/exec/articles.php | 5 ++++-
ecrire/exec/articles_forum.php | 7 ++++---
ecrire/exec/controle_forum.php | 5 ++++-
ecrire/exec/export_all.php | 10 ++++++++--
ecrire/inc/signatures.php | 6 ++++--
5 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php
index 4217e5ebbb..140b2b1309 100644
--- a/ecrire/exec/articles.php
+++ b/ecrire/exec/articles.php
@@ -1336,7 +1336,10 @@ function affiche_forums_article($id_article, $id_rubrique, $titre, $debut, $mute
echo "</div>";
}
- $result_forum = spip_query("SELECT * FROM spip_forum WHERE statut='prive' AND id_article='$id_article' AND id_parent=0 ORDER BY date_heure DESC LIMIT $total_afficher OFFSET $debut");
+ $result_forum = spip_query("SELECT * FROM spip_forum WHERE statut='prive' AND id_article='$id_article' AND id_parent=0 ORDER BY date_heure DESC" .
+# " LIMIT $total_afficher OFFSET $debut" # PG
+ " LIMIT $debut,$total_afficher"
+ );
afficher_forum($result_forum, $forum_retour, $mute);
diff --git a/ecrire/exec/articles_forum.php b/ecrire/exec/articles_forum.php
index 2ef4268bd8..52dcf1b81b 100644
--- a/ecrire/exec/articles_forum.php
+++ b/ecrire/exec/articles_forum.php
@@ -85,9 +85,10 @@ $enplus = 200; // intervalle affiche autour du debut
$limitdeb = ($debut > $enplus) ? $debut-$enplus : 0;
$limitnb = $debut + $enplus - $limitdeb;
-$query_forum = "SELECT id_forum FROM spip_forum WHERE id_article='$id_article' AND id_parent=0 AND statut IN ('publie', 'off', 'prop') LIMIT $limitnb OFFSET $limitdeb";
-$result_forum = spip_query($query_forum);
-
+$result_forum = spip_query("SELECT id_forum FROM spip_forum WHERE id_article='$id_article' AND id_parent=0 AND statut IN ('publie', 'off', 'prop')" .
+# " LIMIT $limitnb OFFSET $limitdeb" # PG
+ " LIMIT $limitdeb, $limitnb"
+ );
$i = $limitdeb;
if ($i>0)
diff --git a/ecrire/exec/controle_forum.php b/ecrire/exec/controle_forum.php
index cf38757bf2..b7411adfc3 100644
--- a/ecrire/exec/controle_forum.php
+++ b/ecrire/exec/controle_forum.php
@@ -267,7 +267,10 @@ F.url_site,
F.statut,
F.ip,
F.id_auteur
-$query_forum ORDER BY F.date_heure DESC LIMIT $limitnb OFFSET $limitdeb");
+$query_forum ORDER BY F.date_heure DESC" .
+# LIMIT $limitnb OFFSET $limitdeb" #PG
+" LIMIT $limitnb, $limitdeb"
+);
debut_gauche();
debut_boite_info();
diff --git a/ecrire/exec/export_all.php b/ecrire/exec/export_all.php
index 0e6986a488..bac5cac7d5 100644
--- a/ecrire/exec/export_all.php
+++ b/ecrire/exec/export_all.php
@@ -135,7 +135,10 @@ function export_objets($query, $type, $file = 0, $gz = false, $etape_en_cours=""
if ($type == "forum"){
$total = spip_num_rows($result);
if ($total > 5000){
- $result = spip_query($query." LIMIT 5000 OFFSET $debut_limit");
+ $result = spip_query($query.
+#" LIMIT 5000 OFFSET $debut_limit" # PG
+" LIMIT 5000,$debut_limit"
+ );
$debut_limit = $debut_limit + 5000;
if ($debut_limit > $total) {
$debut_limit = 0;
@@ -152,7 +155,10 @@ function export_objets($query, $type, $file = 0, $gz = false, $etape_en_cours=""
if ($type == "article"){
$total = spip_num_rows($result);
if ($total > 500){
- $result = spip_query($query." LIMIT 500 OFFSET $debut_limit");
+ $result = spip_query($query.
+#" LIMIT 500 OFFSET $debut_limit" # PG
+" LIMIT 500,$debut_limit"
+ };
$debut_limit = $debut_limit + 500;
if ($debut_limit > $total) {
$debut_limit = 0;
diff --git a/ecrire/inc/signatures.php b/ecrire/inc/signatures.php
index 41447c8505..cb9415ee48 100644
--- a/ecrire/inc/signatures.php
+++ b/ecrire/inc/signatures.php
@@ -22,8 +22,10 @@ function controle_signatures($script, $id, $debut, $where, $order, $limit=10) {
$request = spip_query("SELECT * FROM spip_signatures " .
($where ? " WHERE $where" : "") .
($order ? " ORDER BY $order" : "") .
- " LIMIT $limit" .
- ($debut ? " OFFSET $debut" : ""));
+ " LIMIT " .
+ (($debut ? "$debut," : "") . $limit)
+# ($limit . ($debut ? " OFFSET $debut" : "")); #PG
+ );
while($row=spip_fetch_array($request)){
$id_signature = $row['id_signature'];
--
GitLab