From cbce90ea41eece8a330d5abf530b572e4fcf97fd Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Wed, 28 Sep 2005 16:58:25 +0000
Subject: [PATCH] virer les 'OFFSET 0' qui ne servent qu'a faire hurler les
vieilles versions de Mysql
---
ecrire/articles.php3 | 4 ++--
ecrire/articles_page.php3 | 2 +-
ecrire/articles_versions.php3 | 2 +-
ecrire/auteurs.php3 | 2 +-
ecrire/breves_voir.php3 | 2 +-
ecrire/brouteur_frame.php3 | 6 +++---
ecrire/inc.php3 | 10 +++++-----
ecrire/inc_index.php3 | 10 +++++-----
ecrire/inc_majbase.php3 | 2 +-
ecrire/inc_mots.php3 | 2 +-
ecrire/inc_naviguer.php | 10 +++++-----
ecrire/inc_presentation.php3 | 30 +++++++++++++++---------------
ecrire/inc_rss.php3 | 10 +++++-----
ecrire/inc_sites.php3 | 4 ++--
ecrire/inc_statistiques.php3 | 4 ++--
ecrire/index.php3 | 6 +++---
ecrire/js_menu_rubriques.php | 2 +-
ecrire/message.php3 | 2 +-
ecrire/messagerie.php3 | 2 +-
ecrire/naviguer.php3 | 2 +-
ecrire/sites.php3 | 2 +-
ecrire/sites_edit.php3 | 2 +-
ecrire/sites_tous.php3 | 2 +-
ecrire/statistiques_svg.php3 | 2 +-
ecrire/statistiques_visites.php3 | 6 +++---
ecrire/suivi_revisions.php3 | 4 ++--
inc-cache.php3 | 4 ++--
spip_cal.php3 | 2 +-
28 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/ecrire/articles.php3 b/ecrire/articles.php3
index 06dfc196c0..1c6fed582d 100644
--- a/ecrire/articles.php3
+++ b/ecrire/articles.php3
@@ -235,7 +235,7 @@ if ($titre && !$ajout_forum && $flag_editable) {
if ($articles_versions) {
include("lab_revisions.php");
if ($new != 'oui') {
- $query = "SELECT id_article FROM spip_versions WHERE id_article=$id_article LIMIT 1 OFFSET 0";
+ $query = "SELECT id_article FROM spip_versions WHERE id_article=$id_article LIMIT 1";
if (!spip_num_rows(spip_query($query))) {
spip_log("version initiale de l'article $id_article");
$select = join(", ", $champs);
@@ -607,7 +607,7 @@ if ($options == "avancees" && $connect_statut=='0minirezo' && $flag_editable) {
//
$vos_articles = spip_query("SELECT articles.id_article, articles.titre, articles.statut FROM spip_articles AS articles WHERE articles.id_rubrique='$id_rubrique' AND (articles.statut = 'publie' OR articles.statut = 'prop') AND articles.id_article != '$id_article' ".
- " ORDER BY articles.date DESC LIMIT 30 OFFSET 0");
+ " ORDER BY articles.date DESC LIMIT 30");
if (spip_num_rows($vos_articles) > 0) {
echo "<div> </div>";
echo "<div class='bandeau_rubriques' style='z-index: 1;'>";
diff --git a/ecrire/articles_page.php3 b/ecrire/articles_page.php3
index 417c53e0b6..d0bc5a558f 100644
--- a/ecrire/articles_page.php3
+++ b/ecrire/articles_page.php3
@@ -21,7 +21,7 @@ debut_gauche();
// Afficher le bouton de creation d'article
//
-$query = "SELECT id_rubrique FROM spip_rubriques LIMIT 1 OFFSET 0";
+$query = "SELECT id_rubrique FROM spip_rubriques LIMIT 1";
$result = spip_query($query);
if (spip_num_rows($result) > 0) {
diff --git a/ecrire/articles_versions.php3 b/ecrire/articles_versions.php3
index 14fda1388c..8260161673 100644
--- a/ecrire/articles_versions.php3
+++ b/ecrire/articles_versions.php3
@@ -49,7 +49,7 @@ $id_diff = intval($id_diff);
if (!$id_diff) {
$diff_auto = true;
$query = "SELECT id_version FROM spip_versions WHERE id_article=$id_article ".
- "AND id_version<$id_version ORDER BY id_version DESC LIMIT 1 OFFSET 0";
+ "AND id_version<$id_version ORDER BY id_version DESC LIMIT 1";
if ($result = spip_query($query)) {
$row = spip_fetch_array($result);
$id_diff = $row['id_version'];
diff --git a/ecrire/auteurs.php3 b/ecrire/auteurs.php3
index 1d79aad48b..b9dbea72c5 100644
--- a/ecrire/auteurs.php3
+++ b/ecrire/auteurs.php3
@@ -53,7 +53,7 @@ fin_boite_info();
if ($connect_statut == '0minirezo') {
- $query = "SELECT id_auteur FROM spip_auteurs WHERE statut='6forum' LIMIT 1 OFFSET 0";
+ $query = "SELECT id_auteur FROM spip_auteurs WHERE statut='6forum' LIMIT 1";
$result = spip_query($query);
$flag_visiteurs = spip_num_rows($result) > 0;
diff --git a/ecrire/breves_voir.php3 b/ecrire/breves_voir.php3
index 80ef8bc9b4..1bfffbc7bd 100644
--- a/ecrire/breves_voir.php3
+++ b/ecrire/breves_voir.php3
@@ -308,7 +308,7 @@ echo "</div>";
echo "<P align='left'>";
-$query_forum = "SELECT * FROM spip_forum WHERE statut='prive' AND id_breve='$id_breve' AND id_parent=0 ORDER BY date_heure DESC LIMIT 20 OFFSET 0";
+$query_forum = "SELECT * FROM spip_forum WHERE statut='prive' AND id_breve='$id_breve' AND id_parent=0 ORDER BY date_heure DESC LIMIT 20";
$result_forum = spip_query($query_forum);
afficher_forum($result_forum, $forum_retour);
diff --git a/ecrire/brouteur_frame.php3 b/ecrire/brouteur_frame.php3
index d231bc5bdd..90f574a99f 100644
--- a/ecrire/brouteur_frame.php3
+++ b/ecrire/brouteur_frame.php3
@@ -64,7 +64,7 @@ debut_body();
echo "</div>";
}
- $query = "SELECT * FROM spip_breves WHERE statut = 'prop' ORDER BY date_heure DESC LIMIT 20 OFFSET 0";
+ $query = "SELECT * FROM spip_breves WHERE statut = 'prop' ORDER BY date_heure DESC LIMIT 20";
$result=spip_query($query);
if (spip_num_rows($result)>0) {
echo "<div style='padding-top: 6px;'><b class='verdana2'>"._T("info_breves_valider")."</b></div>";
@@ -141,7 +141,7 @@ debut_body();
echo "</div>";
}
- $query = "SELECT * FROM spip_breves WHERE id_rubrique=$id_rubrique ORDER BY date_heure DESC LIMIT 20 OFFSET 0";
+ $query = "SELECT * FROM spip_breves WHERE id_rubrique=$id_rubrique ORDER BY date_heure DESC LIMIT 20";
$result=spip_query($query);
if (spip_num_rows($result)>0) {
echo "<div style='padding-top: 6px;'><b class='verdana2'>"._T('info_breves_02')."</b></div>";
@@ -221,7 +221,7 @@ debut_body();
$result = spip_query($query);
$total_articles = spip_num_rows($result);
- $query = "SELECT * FROM spip_breves WHERE statut = 'prop' ORDER BY date_heure DESC LIMIT 20 OFFSET 0";
+ $query = "SELECT * FROM spip_breves WHERE statut = 'prop' ORDER BY date_heure DESC LIMIT 20";
$result=spip_query($query);
$total_breves = spip_num_rows($result);
diff --git a/ecrire/inc.php3 b/ecrire/inc.php3
index 15081d98c2..bd0417386b 100644
--- a/ecrire/inc.php3
+++ b/ecrire/inc.php3
@@ -176,23 +176,23 @@ if (!$adresse_site) {
function tester_rubrique_vide($id_rubrique) {
- $query = "SELECT id_rubrique FROM spip_rubriques WHERE id_parent='$id_rubrique' LIMIT 1 OFFSET 0";
+ $query = "SELECT id_rubrique FROM spip_rubriques WHERE id_parent='$id_rubrique' LIMIT 1";
list($n) = spip_fetch_array(spip_query($query));
if ($n > 0) return false;
- $query = "SELECT id_article FROM spip_articles WHERE id_rubrique='$id_rubrique' AND (statut='publie' OR statut='prepa' OR statut='prop') LIMIT 1 OFFSET 0";
+ $query = "SELECT id_article FROM spip_articles WHERE id_rubrique='$id_rubrique' AND (statut='publie' OR statut='prepa' OR statut='prop') LIMIT 1";
list($n) = spip_fetch_array(spip_query($query));
if ($n > 0) return false;
- $query = "SELECT id_breve FROM spip_breves WHERE id_rubrique='$id_rubrique' AND (statut='publie' OR statut='prop') LIMIT 1 OFFSET 0";
+ $query = "SELECT id_breve FROM spip_breves WHERE id_rubrique='$id_rubrique' AND (statut='publie' OR statut='prop') LIMIT 1";
list($n) = spip_fetch_array(spip_query($query));
if ($n > 0) return false;
- $query = "SELECT id_syndic FROM spip_syndic WHERE id_rubrique='$id_rubrique' AND (statut='publie' OR statut='prop') LIMIT 1 OFFSET 0";
+ $query = "SELECT id_syndic FROM spip_syndic WHERE id_rubrique='$id_rubrique' AND (statut='publie' OR statut='prop') LIMIT 1";
list($n) = spip_fetch_array(spip_query($query));
if ($n > 0) return false;
- $query = "SELECT id_document FROM spip_documents_rubriques WHERE id_rubrique='$id_rubrique' LIMIT 1 OFFSET 0";
+ $query = "SELECT id_document FROM spip_documents_rubriques WHERE id_rubrique='$id_rubrique' LIMIT 1";
list($n) = spip_fetch_array(spip_query($query));
if ($n > 0) return false;
diff --git a/ecrire/inc_index.php3 b/ecrire/inc_index.php3
index db027a4994..8cf1133ff2 100644
--- a/ecrire/inc_index.php3
+++ b/ecrire/inc_index.php3
@@ -78,7 +78,7 @@ function indexer_chaine($texte, $val = 1, $min_long = 3) {
function deja_indexe($type, $id_objet) {
$table_index = 'spip_index_'.table_objet($type);
$col_id = 'id_'.$type;
- $query = "SELECT $col_id FROM $table_index WHERE $col_id=$id_objet LIMIT 1 OFFSET 0";
+ $query = "SELECT $col_id FROM $table_index WHERE $col_id=$id_objet LIMIT 1";
$n = @spip_num_rows(@spip_query($query));
return ($n > 0);
}
@@ -300,7 +300,7 @@ function indexer_objet($type, $id_objet, $forcer_reset = true) {
if ($row['syndication'] = "oui") {
$query_syndic = "SELECT titre FROM spip_syndic_articles
WHERE id_syndic=$id_objet AND statut='publie'
- ORDER BY date DESC LIMIT 100 OFFSET 0";
+ ORDER BY date DESC LIMIT 100";
$result_syndic = spip_query($query_syndic);
while ($row_syndic = spip_fetch_array($result_syndic)) {
indexer_chaine($row_syndic['titre'], 5);
@@ -461,7 +461,7 @@ function effectuer_une_indexation($nombre_indexations = 1) {
else
$limit = $nombre_indexations;
- $s = spip_query("SELECT id_$type, idx FROM $table_objet WHERE idx IN ('','1','idx') AND $critere ORDER BY idx='idx',idx='' LIMIT $limit OFFSET 0");
+ $s = spip_query("SELECT id_$type, idx FROM $table_objet WHERE idx IN ('','1','idx') AND $critere ORDER BY idx='idx',idx='' LIMIT $limit");
while ($t = spip_fetch_array($s)) {
$vu[$type] .= $t[0].", ";
indexer_objet($type, $t[0], $t[1]);
@@ -472,7 +472,7 @@ function effectuer_une_indexation($nombre_indexations = 1) {
function executer_une_indexation_syndic() {
$id_syndic = 0;
- if ($row = spip_fetch_array(spip_query("SELECT id_syndic FROM spip_syndic WHERE statut='publie' AND date_index < DATE_SUB(NOW(), INTERVAL 7 DAY) ORDER BY date_index LIMIT 1 OFFSET 0"))) {
+ if ($row = spip_fetch_array(spip_query("SELECT id_syndic FROM spip_syndic WHERE statut='publie' AND date_index < DATE_SUB(NOW(), INTERVAL 7 DAY) ORDER BY date_index LIMIT 1"))) {
$id_syndic = $row['id_syndic'];
spip_query("UPDATE spip_syndic SET date_index=NOW() WHERE id_syndic=$id_syndic");
marquer_indexer('syndic', $id_syndic);
@@ -512,7 +512,7 @@ function requete_txt_integral($objet, $hash_recherche) {
AND rec.hash IN ($hash_recherche)
GROUP BY objet.$id_objet
ORDER BY points DESC
- LIMIT 10 OFFSET 0";
+ LIMIT 10";
}
// rechercher un mot dans le dico
diff --git a/ecrire/inc_majbase.php3 b/ecrire/inc_majbase.php3
index 019e82acdc..afb5133b5c 100644
--- a/ecrire/inc_majbase.php3
+++ b/ecrire/inc_majbase.php3
@@ -423,7 +423,7 @@ function maj_base() {
}
if ($version_installee < 1.418) {
- $query = "SELECT * FROM spip_auteurs WHERE statut = '0minirezo' AND email != '' ORDER BY id_auteur LIMIT 1 OFFSET 0";
+ $query = "SELECT * FROM spip_auteurs WHERE statut = '0minirezo' AND email != '' ORDER BY id_auteur LIMIT 1";
$result = spip_query($query);
if ($webmaster = spip_fetch_array($result)) {
include_ecrire("inc_meta.php3");
diff --git a/ecrire/inc_mots.php3 b/ecrire/inc_mots.php3
index 8371c5e956..2c0a36908f 100644
--- a/ecrire/inc_mots.php3
+++ b/ecrire/inc_mots.php3
@@ -561,7 +561,7 @@ function afficher_groupe_mots($id_groupe) {
if (strlen($tranches)) {
- $res_proch = spip_query("SELECT id_ajax_fonc FROM spip_ajax_fonc WHERE hash=$hash AND id_auteur=$connect_id_auteur ORDER BY id_ajax_fonc DESC LIMIT 1 OFFSET 0");
+ $res_proch = spip_query("SELECT id_ajax_fonc FROM spip_ajax_fonc WHERE hash=$hash AND id_auteur=$connect_id_auteur ORDER BY id_ajax_fonc DESC LIMIT 1");
if ($row = spip_fetch_array($res_proch)) {
$id_ajax_fonc = $row["id_ajax_fonc"];
} else {
diff --git a/ecrire/inc_naviguer.php b/ecrire/inc_naviguer.php
index 18bbb8aba2..6498e07e73 100644
--- a/ecrire/inc_naviguer.php
+++ b/ecrire/inc_naviguer.php
@@ -50,7 +50,7 @@ function raccourcis_naviguer($id_rubrique, $id_parent)
icone_horizontale(_T('icone_tous_articles'), "articles_page.php3", "article-24.gif");
- if (spip_num_rows(spip_query("SELECT id_rubrique FROM spip_rubriques LIMIT 1 OFFSET 0")) > 0) {
+ if (spip_num_rows(spip_query("SELECT id_rubrique FROM spip_rubriques LIMIT 1")) > 0) {
if ($id_rubrique > 0)
icone_horizontale(_T('icone_ecrire_article'), "articles_edit.php3?id_rubrique=$id_rubrique&new=oui", "article-24.gif","creer.gif");
@@ -125,25 +125,25 @@ echo "<P>";
$relief = false;
if (!$relief) {
- $query = "SELECT id_article FROM spip_articles AS articles WHERE id_rubrique='$id_rubrique' AND statut='prop' LIMIT 1 OFFSET 0";
+ $query = "SELECT id_article FROM spip_articles AS articles WHERE id_rubrique='$id_rubrique' AND statut='prop' LIMIT 1";
$result = spip_query($query);
$relief = (spip_num_rows($result) > 0);
}
if (!$relief) {
- $query = "SELECT id_breve FROM spip_breves WHERE id_rubrique='$id_rubrique' AND (statut='prepa' OR statut='prop') LIMIT 1 OFFSET 0";
+ $query = "SELECT id_breve FROM spip_breves WHERE id_rubrique='$id_rubrique' AND (statut='prepa' OR statut='prop') LIMIT 1";
$result = spip_query($query);
$relief = (spip_num_rows($result) > 0);
}
if (!$relief AND lire_meta('activer_syndic') != 'non') {
- $query = "SELECT id_syndic FROM spip_syndic WHERE id_rubrique='$id_rubrique' AND statut='prop' LIMIT 1 OFFSET 0";
+ $query = "SELECT id_syndic FROM spip_syndic WHERE id_rubrique='$id_rubrique' AND statut='prop' LIMIT 1";
$result = spip_query($query);
$relief = (spip_num_rows($result) > 0);
}
if (!$relief AND lire_meta('activer_syndic') != 'non' AND $connect_statut == '0minirezo' AND $connect_toutes_rubriques) {
- $query = "SELECT id_syndic FROM spip_syndic WHERE id_rubrique='$id_rubrique' AND (syndication='off' OR syndication='sus') LIMIT 1 OFFSET 0";
+ $query = "SELECT id_syndic FROM spip_syndic WHERE id_rubrique='$id_rubrique' AND (syndication='off' OR syndication='sus') LIMIT 1";
$result = spip_query($query);
$relief = (spip_num_rows($result) > 0);
}
diff --git a/ecrire/inc_presentation.php3 b/ecrire/inc_presentation.php3
index cc596c0750..157200e34e 100644
--- a/ecrire/inc_presentation.php3
+++ b/ecrire/inc_presentation.php3
@@ -751,7 +751,7 @@ function afficher_articles($titre_table, $requete, $afficher_visites = false, $a
$div_trad = substr(md5($requete), 0, 4);
- $res_proch = spip_query("SELECT id_ajax_fonc FROM spip_ajax_fonc WHERE hash=$hash AND id_auteur=$connect_id_auteur ORDER BY id_ajax_fonc DESC LIMIT 1 OFFSET 0");
+ $res_proch = spip_query("SELECT id_ajax_fonc FROM spip_ajax_fonc WHERE hash=$hash AND id_auteur=$connect_id_auteur ORDER BY id_ajax_fonc DESC LIMIT 1");
if ($row = spip_fetch_array($res_proch)) {
$id_ajax_trad = $row["id_ajax_fonc"];
} else {
@@ -808,7 +808,7 @@ function afficher_articles($titre_table, $requete, $afficher_visites = false, $a
if (strlen($tranches) OR $toujours_afficher) {
- $res_proch = spip_query("SELECT id_ajax_fonc FROM spip_ajax_fonc WHERE hash=$hash AND id_auteur=$connect_id_auteur ORDER BY id_ajax_fonc DESC LIMIT 1 OFFSET 0");
+ $res_proch = spip_query("SELECT id_ajax_fonc FROM spip_ajax_fonc WHERE hash=$hash AND id_auteur=$connect_id_auteur ORDER BY id_ajax_fonc DESC LIMIT 1");
if ($row = spip_fetch_array($res_proch)) {
$id_ajax_fonc = $row["id_ajax_fonc"];
} else {
@@ -996,7 +996,7 @@ function afficher_articles_trad($titre_table, $requete, $afficher_visites = fals
$div_trad = substr(md5($requete), 0, 4);
- $res_proch = spip_query("SELECT id_ajax_fonc FROM spip_ajax_fonc WHERE hash=$hash AND id_auteur=$connect_id_auteur ORDER BY id_ajax_fonc DESC LIMIT 1 OFFSET 0");
+ $res_proch = spip_query("SELECT id_ajax_fonc FROM spip_ajax_fonc WHERE hash=$hash AND id_auteur=$connect_id_auteur ORDER BY id_ajax_fonc DESC LIMIT 1");
if ($row = spip_fetch_array($res_proch)) {
$id_ajax_trad = $row["id_ajax_fonc"];
} else {
@@ -1036,7 +1036,7 @@ function afficher_articles_trad($titre_table, $requete, $afficher_visites = fals
if (strlen($tranches) OR $toujours_afficher) {
- $res_proch = spip_query("SELECT id_ajax_fonc FROM spip_ajax_fonc WHERE hash=$hash AND id_auteur=$connect_id_auteur ORDER BY id_ajax_fonc DESC LIMIT 1 OFFSET 0");
+ $res_proch = spip_query("SELECT id_ajax_fonc FROM spip_ajax_fonc WHERE hash=$hash AND id_auteur=$connect_id_auteur ORDER BY id_ajax_fonc DESC LIMIT 1");
if ($row = spip_fetch_array($res_proch)) {
$id_ajax_fonc = $row["id_ajax_fonc"];
} else {
@@ -2051,12 +2051,12 @@ function barre_onglets($rubrique, $onglet){
onglet(_T('onglet_messages_publics'), "controle_forum.php3?page=public", "public", $onglet, "forum-public-24.gif");
onglet(_T('onglet_messages_internes'), "controle_forum.php3?page=interne", "interne", $onglet, "forum-interne-24.gif");
- $query_forum = "SELECT * FROM spip_forum WHERE statut='publie' AND texte='' LIMIT 1 OFFSET 0";
+ $query_forum = "SELECT * FROM spip_forum WHERE statut='publie' AND texte='' LIMIT 1";
$result_forum = spip_query($query_forum);
if ($row = spip_fetch_array($result_forum))
onglet(_T('onglet_messages_vide'), "controle_forum.php3?page=vide", "vide", $onglet);
- $query_forum = "SELECT * FROM spip_forum WHERE statut='prop' LIMIT 1 OFFSET 0";
+ $query_forum = "SELECT * FROM spip_forum WHERE statut='prop' LIMIT 1";
$result_forum = spip_query($query_forum);
if ($row = spip_fetch_array($result_forum))
onglet(_T('texte_statut_attente_validation'), "controle_forum.php3?page=prop", "prop", $onglet);
@@ -2440,7 +2440,7 @@ else {
echo "<div class='$class' id='bandeaudocuments' style='position: absolute; $spip_lang_left: ".$decal."px;'><div class='bandeau_sec'><table class='gauche'><tr>\n";
//icone_bandeau_secondaire (_T('icone_rubriques'), "naviguer.php3", "rubrique-24.gif", "rubriques", $sous_rubrique);
- $nombre_articles = spip_num_rows(spip_query("SELECT art.id_article FROM spip_articles AS art, spip_auteurs_articles AS lien WHERE lien.id_auteur = '$connect_id_auteur' AND art.id_article = lien.id_article LIMIT 1 OFFSET 0"));
+ $nombre_articles = spip_num_rows(spip_query("SELECT art.id_article FROM spip_articles AS art, spip_auteurs_articles AS lien WHERE lien.id_auteur = '$connect_id_auteur' AND art.id_article = lien.id_article LIMIT 1"));
if ($nombre_articles > 0) {
icone_bandeau_secondaire (_T('icone_tous_articles'), "articles_page.php3", "article-24.gif", "articles", $sous_rubrique);
}
@@ -2451,7 +2451,7 @@ else {
$nombre_versions = spip_num_rows(spip_query("
SELECT versions.*, articles.statut, articles.titre
FROM spip_versions AS versions, spip_articles AS articles
- WHERE versions.id_article = articles.id_article AND versions.id_version > 1$req_where LIMIT 1 OFFSET 0"));
+ WHERE versions.id_article = articles.id_article AND versions.id_version > 1$req_where LIMIT 1"));
if ($nombre_versions > 0 OR 1==1) {
icone_bandeau_secondaire (_T('icone_suivi_revisions'), "suivi_revisions.php3", "historique-24.gif", "revisions", $sous_rubrique);
}
@@ -2472,7 +2472,7 @@ else {
if ($activer_sites<>'non')
icone_bandeau_secondaire (_T('icone_sites_references'), "sites_tous.php3", "site-24.gif", "sites", $sous_rubrique);
- if (@spip_num_rows(spip_query("SELECT * FROM spip_documents_rubriques LIMIT 1 OFFSET 0")) > 0) {
+ if (@spip_num_rows(spip_query("SELECT * FROM spip_documents_rubriques LIMIT 1")) > 0) {
icone_bandeau_secondaire (_T('icone_doc_rubrique'), "documents_liste.php3", "doc-24.gif", "documents", $sous_rubrique);
}
}
@@ -2746,7 +2746,7 @@ else {
$gadget = '';
$vos_articles = spip_query("SELECT articles.id_article, articles.titre, articles.statut FROM spip_articles AS articles, spip_auteurs_articles AS lien WHERE articles.id_article=lien.id_article ".
- "AND lien.id_auteur=$connect_id_auteur AND articles.statut='prepa' ORDER BY articles.date DESC LIMIT 5 OFFSET 0");
+ "AND lien.id_auteur=$connect_id_auteur AND articles.statut='prepa' ORDER BY articles.date DESC LIMIT 5");
if (spip_num_rows($vos_articles) > 0) {
$gadget .= "<div> </div>";
$gadget .= "<div class='bandeau_rubriques' style='z-index: 1;'>";
@@ -2763,7 +2763,7 @@ else {
}
$vos_articles = spip_query("SELECT articles.id_article, articles.titre, articles.statut FROM spip_articles AS articles WHERE articles.statut='prop' ".
- " ORDER BY articles.date DESC LIMIT 5 OFFSET 0");
+ " ORDER BY articles.date DESC LIMIT 5");
if (spip_num_rows($vos_articles) > 0) {
$gadget .= "<div> </div>";
$gadget .= "<div class='bandeau_rubriques' style='z-index: 1;'>";
@@ -2781,7 +2781,7 @@ else {
}
$vos_articles = spip_query("SELECT * FROM spip_breves WHERE statut='prop' ".
- " ORDER BY date_heure DESC LIMIT 5 OFFSET 0");
+ " ORDER BY date_heure DESC LIMIT 5");
if (spip_num_rows($vos_articles) > 0) {
$gadget .= "<div> </div>";
$gadget .= "<div class='bandeau_rubriques' style='z-index: 1;'>";
@@ -2799,7 +2799,7 @@ else {
}
- $query = "SELECT id_rubrique FROM spip_rubriques LIMIT 1 OFFSET 0";
+ $query = "SELECT id_rubrique FROM spip_rubriques LIMIT 1";
$result = spip_query($query);
if (spip_num_rows($result) > 0) {
@@ -2871,8 +2871,8 @@ else {
$jour = jour($date);
// Taches (ne calculer que la valeur booleenne...)
- if (spip_num_rows(spip_query("SELECT type FROM spip_messages AS messages WHERE id_auteur=$connect_id_auteur AND statut='publie' AND type='pb' AND rv!='oui' LIMIT 1 OFFSET 0")) OR
- spip_num_rows(spip_query("SELECT type FROM spip_messages AS messages, spip_auteurs_messages AS lien WHERE ((lien.id_auteur='$connect_id_auteur' AND lien.id_message=messages.id_message) OR messages.type='affich') AND messages.rv='oui' AND messages.date_heure > DATE_SUB(NOW(), INTERVAL 1 DAY) AND messages.date_heure < DATE_ADD(NOW(), INTERVAL 1 MONTH) AND messages.statut='publie' GROUP BY messages.id_message ORDER BY messages.date_heure LIMIT 1 OFFSET 0"))) {
+ if (spip_num_rows(spip_query("SELECT type FROM spip_messages AS messages WHERE id_auteur=$connect_id_auteur AND statut='publie' AND type='pb' AND rv!='oui' LIMIT 1")) OR
+ spip_num_rows(spip_query("SELECT type FROM spip_messages AS messages, spip_auteurs_messages AS lien WHERE ((lien.id_auteur='$connect_id_auteur' AND lien.id_message=messages.id_message) OR messages.type='affich') AND messages.rv='oui' AND messages.date_heure > DATE_SUB(NOW(), INTERVAL 1 DAY) AND messages.date_heure < DATE_ADD(NOW(), INTERVAL 1 MONTH) AND messages.statut='publie' GROUP BY messages.id_message ORDER BY messages.date_heure LIMIT 1"))) {
$largeur = "410px";
$afficher_cal = true;
}
diff --git a/ecrire/inc_rss.php3 b/ecrire/inc_rss.php3
index 097045004c..4b089c7b06 100644
--- a/ecrire/inc_rss.php3
+++ b/ecrire/inc_rss.php3
@@ -199,7 +199,7 @@ function rss_suivi_forums($a, $query_forum='', $lien_moderation=false) {
SELECT *
FROM spip_forum
WHERE " . $query_forum . "
- ORDER BY date_heure DESC LIMIT 20 OFFSET 0"
+ ORDER BY date_heure DESC LIMIT 20"
);
while ($t = spip_fetch_array($result_forum)) {
@@ -272,7 +272,7 @@ function rss_suivi_messagerie($a) {
if ($messages_vus) {
$s = spip_query("SELECT * FROM spip_forum WHERE id_message
IN (".join(',', $messages_vus).")
- ORDER BY date_heure DESC LIMIT 10 OFFSET 0");
+ ORDER BY date_heure DESC LIMIT 10");
while ($t = spip_fetch_array($s)) {
$item = array(
@@ -303,7 +303,7 @@ function rss_a_suivre($a) {
function rss_articles($critere) {
$s = spip_query("SELECT * FROM spip_articles WHERE $critere
- ORDER BY date DESC LIMIT 10 OFFSET 0");
+ ORDER BY date DESC LIMIT 10");
while ($t = spip_fetch_array($s)) {
$auteur = spip_fetch_array(spip_query("SELECT
auteurs.nom AS nom, auteurs.email AS email
@@ -331,7 +331,7 @@ function rss_articles($critere) {
function rss_breves($critere) {
$s = spip_query("SELECT * FROM spip_breves WHERE $critere
- ORDER BY date_heure DESC LIMIT 10 OFFSET 0");
+ ORDER BY date_heure DESC LIMIT 10");
while ($t = spip_fetch_array($s)) {
$item = array(
'title' => typo($t['titre']),
@@ -351,7 +351,7 @@ function rss_breves($critere) {
function rss_sites($critere) {
$s = spip_query("SELECT * FROM spip_syndic WHERE $critere
- ORDER BY date DESC LIMIT 10 OFFSET 0");
+ ORDER BY date DESC LIMIT 10");
while ($t = spip_fetch_array($s)) {
$item = array(
'title' => typo($t['titre']." ".$t['url_site']),
diff --git a/ecrire/inc_sites.php3 b/ecrire/inc_sites.php3
index 6d25a22709..6143865d14 100644
--- a/ecrire/inc_sites.php3
+++ b/ecrire/inc_sites.php3
@@ -1033,13 +1033,13 @@ function executer_une_syndication() {
// On va tenter un site 'sus' ou 'off' de plus de 24h, et le passer en 'off'
// s'il echoue
- if ($row = spip_fetch_array(spip_query("SELECT * FROM spip_syndic WHERE syndication IN ('sus','off') AND statut='publie' AND date_syndic < DATE_SUB(NOW(), INTERVAL 24 HOUR) ORDER BY date_syndic LIMIT 1 OFFSET 0"))) {
+ if ($row = spip_fetch_array(spip_query("SELECT * FROM spip_syndic WHERE syndication IN ('sus','off') AND statut='publie' AND date_syndic < DATE_SUB(NOW(), INTERVAL 24 HOUR) ORDER BY date_syndic LIMIT 1"))) {
$id_syndic = $row["id_syndic"];
syndic_a_jour($id_syndic, 'off');
}
// Et un site 'oui' de plus de 2 heures, qui passe en 'sus' s'il echoue
- if ($row = spip_fetch_array(spip_query("SELECT * FROM spip_syndic WHERE syndication='oui' AND statut='publie' AND date_syndic < DATE_SUB(NOW(), INTERVAL 2 HOUR) ORDER BY date_syndic LIMIT 1 OFFSET 0"))) {
+ if ($row = spip_fetch_array(spip_query("SELECT * FROM spip_syndic WHERE syndication='oui' AND statut='publie' AND date_syndic < DATE_SUB(NOW(), INTERVAL 2 HOUR) ORDER BY date_syndic LIMIT 1"))) {
$id_syndic = $row["id_syndic"];
syndic_a_jour($id_syndic, 'sus');
}
diff --git a/ecrire/inc_statistiques.php3 b/ecrire/inc_statistiques.php3
index 765787de40..2c97a6a376 100644
--- a/ecrire/inc_statistiques.php3
+++ b/ecrire/inc_statistiques.php3
@@ -186,7 +186,7 @@ function calculer_n_referers($nb_referers) {
$date = date("Y-m-d");
$result = spip_query("SELECT COUNT(DISTINCT ip) AS visites, referer, HEX(referer_md5) AS md5 ".
- "FROM spip_referers_temp GROUP BY referer_md5 LIMIT $nb_referers OFFSET 0");
+ "FROM spip_referers_temp GROUP BY referer_md5 LIMIT $nb_referers");
$tous = spip_num_rows($result);
@@ -267,7 +267,7 @@ function aff_referers ($query, $limit=10, $plus = true) {
// Charger les moteurs de recherche
$arr_engines = stats_load_engines();
- $query .= " LIMIT $limit OFFSET 0";
+ $query .= " LIMIT $limit";
$result = spip_query($query);
while ($row = spip_fetch_array($result)) {
diff --git a/ecrire/index.php3 b/ecrire/index.php3
index a97946a7bd..a9e64c70de 100644
--- a/ecrire/index.php3
+++ b/ecrire/index.php3
@@ -227,7 +227,7 @@ if ($vos_articles) $vos_articles = ' AND articles.id_article NOT IN ('.join($vos
//
if ($spip_display == 4) {
debut_raccourcis();
- if (spip_num_rows(spip_query("SELECT id_rubrique FROM spip_rubriques LIMIT 1 OFFSET 0"))) {
+ if (spip_num_rows(spip_query("SELECT id_rubrique FROM spip_rubriques LIMIT 1"))) {
icone_horizontale(_T('icone_ecrire_article'), "articles_edit.php3?new=oui", "article-24.gif","creer.gif");
$activer_breves = lire_meta("activer_breves");
@@ -259,7 +259,7 @@ if ($spip_display == 4) {
$gadget .= icone_horizontale(_T('icone_creer_rubrique'), "rubriques_edit.php3?new=oui", "rubrique-24.gif", "creer.gif", false);
$gadget .= "</td>";
}
- if (spip_num_rows(spip_query("SELECT id_rubrique FROM spip_rubriques LIMIT 1 OFFSET 0"))) {
+ if (spip_num_rows(spip_query("SELECT id_rubrique FROM spip_rubriques LIMIT 1"))) {
$gadget .= "<td>";
$gadget .= icone_horizontale(_T('icone_ecrire_article'), "articles_edit.php3?new=oui$dans_rub", "article-24.gif","creer.gif", false);
$gadget .= "</td>";
@@ -287,7 +287,7 @@ if ($spip_display == 4) {
$gadget .= "<center><table><tr>";
- $nombre_articles = spip_num_rows(spip_query("SELECT art.id_article FROM spip_articles AS art, spip_auteurs_articles AS lien WHERE lien.id_auteur = '$connect_id_auteur' AND art.id_article = lien.id_article LIMIT 1 OFFSET 0"));
+ $nombre_articles = spip_num_rows(spip_query("SELECT art.id_article FROM spip_articles AS art, spip_auteurs_articles AS lien WHERE lien.id_auteur = '$connect_id_auteur' AND art.id_article = lien.id_article LIMIT 1"));
if ($nombre_articles > 0) {
$gadget .= "<td>";
$gadget .= icone_horizontale (_T('icone_tous_articles'), "articles_page.php3", "article-24.gif", "", false);
diff --git a/ecrire/js_menu_rubriques.php b/ecrire/js_menu_rubriques.php
index 6ed9be87d1..0e0ab54786 100644
--- a/ecrire/js_menu_rubriques.php
+++ b/ecrire/js_menu_rubriques.php
@@ -29,7 +29,7 @@ function gen_liste_rubriques() {
// se restreindre aux rubriques utilisees recemment +secteurs
$liste="0";
$s = spip_query("SELECT id_rubrique FROM spip_rubriques
- ORDER BY id_parent=0 DESC, date DESC LIMIT 500 OFFSET 0");
+ ORDER BY id_parent=0 DESC, date DESC LIMIT 500");
while ($t = spip_fetch_array($s))
$liste .=",".$t['id_rubrique'];
diff --git a/ecrire/message.php3 b/ecrire/message.php3
index d4aa8856c5..e37b3247f5 100644
--- a/ecrire/message.php3
+++ b/ecrire/message.php3
@@ -167,7 +167,7 @@ function http_afficher_forum_perso($id_message, $titre)
icone(_T('icone_poster_message'), "forum_envoi.php3?statut=perso&adresse_retour=".$forum_retour."&id_message=$id_message&titre_message=".urlencode($titre), "forum-interne-24.gif", "creer.gif");
echo "</div>\n<p align='left'>";
- $query_forum = "SELECT * FROM spip_forum WHERE statut='perso' AND id_message='$id_message' AND id_parent=0 ORDER BY date_heure DESC LIMIT 20 OFFSET 0";
+ $query_forum = "SELECT * FROM spip_forum WHERE statut='perso' AND id_message='$id_message' AND id_parent=0 ORDER BY date_heure DESC LIMIT 20";
afficher_forum(spip_query($query_forum), $forum_retour);
echo "\n</p>";
}
diff --git a/ecrire/messagerie.php3 b/ecrire/messagerie.php3
index bc13037a6f..16ec078568 100644
--- a/ecrire/messagerie.php3
+++ b/ecrire/messagerie.php3
@@ -124,7 +124,7 @@ afficher_messages(_T('info_message_en_redaction'), $query_message, true, false,
$query = "SELECT auteurs.id_auteur, auteurs.nom, COUNT(*) AS total FROM spip_auteurs AS auteurs, spip_auteurs_messages AS lien2, spip_messages AS messages, spip_auteurs_messages AS lien ".
"WHERE (lien.id_auteur = $connect_id_auteur AND lien.id_message = messages.id_message AND messages.statut = 'publie' AND (messages.rv != 'oui' OR messages.date_fin > NOW() )) ".
"AND (lien2.id_auteur = lien2.id_auteur AND lien2.id_message = messages.id_message AND lien2.id_auteur != $connect_id_auteur AND auteurs.id_auteur = lien2.id_auteur) ".
- "GROUP BY auteurs.id_auteur ORDER BY total DESC LIMIT 10 OFFSET 0";
+ "GROUP BY auteurs.id_auteur ORDER BY total DESC LIMIT 10";
$result = spip_query($query);
if (spip_num_rows($result) > 0) {
diff --git a/ecrire/naviguer.php3 b/ecrire/naviguer.php3
index e31cbe882d..d97136f465 100644
--- a/ecrire/naviguer.php3
+++ b/ecrire/naviguer.php3
@@ -48,7 +48,7 @@ else {
// si c'est une rubrique-secteur contenant des breves, ne deplacer
// que si $confirme_deplace == 'oui'
- if ((spip_num_rows(spip_query("SELECT id_rubrique FROM spip_breves WHERE id_rubrique='$id_rubrique' LIMIT 1 OFFSET 0")) > 0)
+ if ((spip_num_rows(spip_query("SELECT id_rubrique FROM spip_breves WHERE id_rubrique='$id_rubrique' LIMIT 1")) > 0)
AND ($confirme_deplace != 'oui')) {
$id_parent = 0;
}
diff --git a/ecrire/sites.php3 b/ecrire/sites.php3
index 3376782182..e74e65de23 100644
--- a/ecrire/sites.php3
+++ b/ecrire/sites.php3
@@ -519,7 +519,7 @@ echo "</div>";
echo "<p align='left'>\n";
$result_forum = spip_query("SELECT * FROM spip_forum WHERE statut='prive'
-AND id_syndic=$id_syndic AND id_parent=0 ORDER BY date_heure DESC LIMIT 20 OFFSET 0");
+AND id_syndic=$id_syndic AND id_parent=0 ORDER BY date_heure DESC LIMIT 20");
afficher_forum($result_forum, $forum_retour);
diff --git a/ecrire/sites_edit.php3 b/ecrire/sites_edit.php3
index 8aab37e181..aaa1171a33 100644
--- a/ecrire/sites_edit.php3
+++ b/ecrire/sites_edit.php3
@@ -18,7 +18,7 @@ include_ecrire ("inc_sites.php3");
$proposer_sites = lire_meta("proposer_sites");
function premiere_rubrique(){
- $query="SELECT * FROM spip_rubriques WHERE id_parent='0' ORDER BY titre LIMIT 1 OFFSET 0";
+ $query="SELECT * FROM spip_rubriques WHERE id_parent='0' ORDER BY titre LIMIT 1";
$result=spip_query($query);
while($row=spip_fetch_array($result)){
diff --git a/ecrire/sites_tous.php3 b/ecrire/sites_tous.php3
index 2bb6d017f8..0591993cb8 100644
--- a/ecrire/sites_tous.php3
+++ b/ecrire/sites_tous.php3
@@ -61,7 +61,7 @@ if ($options == 'avancees' AND $connect_statut == '0minirezo') {
}
afficher_syndic_articles(_T('titre_dernier_article_syndique'),
- "SELECT * FROM spip_syndic_articles ORDER BY date DESC LIMIT 50 OFFSET 0", 'afficher site');
+ "SELECT * FROM spip_syndic_articles ORDER BY date DESC LIMIT 50", 'afficher site');
fin_page();
diff --git a/ecrire/statistiques_svg.php3 b/ecrire/statistiques_svg.php3
index b66cbca93f..3daa7afbce 100644
--- a/ecrire/statistiques_svg.php3
+++ b/ecrire/statistiques_svg.php3
@@ -79,7 +79,7 @@ echo "<?xml version=\"1.0\" standalone=\"no\"?>";
// Recuperer premier jour
$query="SELECT UNIX_TIMESTAMP(date) AS date_unix FROM $table ".
- "$where ORDER BY date LIMIT 1 OFFSET 0";
+ "$where ORDER BY date LIMIT 1";
$result = spip_query($query);
while ($row = spip_fetch_array($result)) {
$date_premier = $row['date_unix'];
diff --git a/ecrire/statistiques_visites.php3 b/ecrire/statistiques_visites.php3
index e220ccf46e..21c54f075c 100644
--- a/ecrire/statistiques_visites.php3
+++ b/ecrire/statistiques_visites.php3
@@ -100,7 +100,7 @@ else {
// Par popularite
$articles_recents[] = "0";
- $query = "SELECT id_article FROM spip_articles WHERE statut='publie' AND popularite > 0 ORDER BY date DESC LIMIT 10 OFFSET 0";
+ $query = "SELECT id_article FROM spip_articles WHERE statut='publie' AND popularite > 0 ORDER BY date DESC LIMIT 10";
$result = spip_query($query);
while ($row = spip_fetch_array($result)) {
$articles_recents[] = $row['id_article'];
@@ -171,7 +171,7 @@ else {
// Par visites depuis le debut
- $query = "SELECT id_article, titre, popularite, visites FROM spip_articles WHERE statut='publie' AND popularite > 0 ORDER BY visites DESC LIMIT 30 OFFSET 0";
+ $query = "SELECT id_article, titre, popularite, visites FROM spip_articles WHERE statut='publie' AND popularite > 0 ORDER BY visites DESC LIMIT 30";
$result = spip_query($query);
if (spip_num_rows($result) > 0) {
@@ -251,7 +251,7 @@ if (!$origine) {
}
$query="SELECT UNIX_TIMESTAMP(date) AS date_unix FROM $table ".
- "WHERE $where ORDER BY date LIMIT 1 OFFSET 0";
+ "WHERE $where ORDER BY date LIMIT 1";
$result = spip_query($query);
while ($row = spip_fetch_array($result)) {
$date_premier = $row['date_unix'];
diff --git a/ecrire/suivi_revisions.php3 b/ecrire/suivi_revisions.php3
index 9bb040f665..98ef1a7a23 100644
--- a/ecrire/suivi_revisions.php3
+++ b/ecrire/suivi_revisions.php3
@@ -63,7 +63,7 @@ while ($row = mysql_fetch_array($result)) {
$query_rub = "
SELECT versions.*, articles.statut, articles.titre
FROM spip_versions AS versions, spip_articles AS articles
-WHERE versions.id_article = articles.id_article AND versions.id_version > 1 AND articles.id_secteur=$id_rubrique$req_where LIMIT 1 OFFSET 0";
+WHERE versions.id_article = articles.id_article AND versions.id_version > 1 AND articles.id_secteur=$id_rubrique$req_where LIMIT 1";
$result_rub = spip_query($query_rub);
if ($id_rubrique == $id_secteur) echo "<li><b>$titre</b>";
@@ -80,7 +80,7 @@ if ((lire_meta('multi_rubriques') == 'oui') OR (lire_meta('multi_articles') == '
$query_lang = "
SELECT versions.*
FROM spip_versions AS versions, spip_articles AS articles
-WHERE versions.id_article = articles.id_article AND versions.id_version > 1 AND articles.lang='$lang' $req_where LIMIT 1 OFFSET 0";
+WHERE versions.id_article = articles.id_article AND versions.id_version > 1 AND articles.lang='$lang' $req_where LIMIT 1";
$result_lang = spip_query($query_lang);
if ($lang == $lang_choisie) echo "<li><b>$titre</b>";
diff --git a/inc-cache.php3 b/inc-cache.php3
index 3a1d3c6686..66fdcae6a3 100644
--- a/inc-cache.php3
+++ b/inc-cache.php3
@@ -100,7 +100,7 @@ function retire_caches($chemin = '') {
// En priorite le cache qu'on appelle maintenant
if ($chemin) {
$q = spip_query("SELECT fichier FROM spip_caches
- WHERE fichier = '".addslashes($chemin)."' AND type='x' LIMIT 1 OFFSET 0");
+ WHERE fichier = '".addslashes($chemin)."' AND type='x' LIMIT 1");
if ($r = spip_fetch_array($q))
$suppr[$r['fichier']] = true;
}
@@ -112,7 +112,7 @@ function retire_caches($chemin = '') {
ecrire_metas();
$q = spip_query("SELECT fichier FROM spip_caches
- WHERE type='x' LIMIT 100 OFFSET 0");
+ WHERE type='x' LIMIT 100");
while ($r = spip_fetch_array($q)) {
$compte ++; # compte le nombre de resultats vus (y compris doublons)
$suppr[$r['fichier']] = true;
diff --git a/spip_cal.php3 b/spip_cal.php3
index faf7dd79d2..726b517278 100644
--- a/spip_cal.php3
+++ b/spip_cal.php3
@@ -238,7 +238,7 @@ while($row=spip_fetch_array($result_messages)){
if ($id_auteur == $id_utilisateur) ligne ("ORGANIZER:$nom_auteur <$email>");
else ligne ("ATTENDEE:$nom_auteur <$email>");
}
- $query_forum = "SELECT * FROM spip_forum WHERE statut='perso' AND id_message='$id_message' ORDER BY date_heure DESC LIMIT 1 OFFSET 0";
+ $query_forum = "SELECT * FROM spip_forum WHERE statut='perso' AND id_message='$id_message' ORDER BY date_heure DESC LIMIT 1";
$result_forum = spip_query($query_forum);
if ($row_forum = spip_fetch_array($result_forum)) {
$date_heure = $row_forum["date_heure"];
--
GitLab