From 36e238d65ce4c095fc1826698163ba8a5cd888e0 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Thu, 27 Apr 2006 22:29:52 +0000
Subject: [PATCH] =?UTF-8?q?T=C3=A2che=20#209:=20pas=20d'index=20num=C3=A9r?=
=?UTF-8?q?ique=20dans=20un=20tableau=20construit=20par=20spip=5Ffetch=5Fa?=
=?UTF-8?q?rray?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/exec/export_all.php | 24 ++++++++++++------------
ecrire/exec/rubriques_edit.php | 3 ++-
ecrire/inc/forum_insert.php | 6 ++++--
ecrire/inc/indexation.php | 3 ++-
4 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/ecrire/exec/export_all.php b/ecrire/exec/export_all.php
index 401b376b4a..8c7c289e6d 100644
--- a/ecrire/exec/export_all.php
+++ b/ecrire/exec/export_all.php
@@ -157,13 +157,13 @@ function export_objets($table, $type, $file = 0, $gz = false, $etape_en_cours=""
}
// Exporter les relations
if ($type == 'article') {
- $res2 = spip_query("SELECT id_auteur FROM spip_auteurs_articles WHERE id_article=".$row[0]);
+ $res2 = spip_query("SELECT id_auteur FROM spip_auteurs_articles WHERE id_article=".$row['id_article']);
while($row2 = spip_fetch_array($res2)) {
$string .= '<lien:auteur>' . $row2['id_auteur'] . '</lien:auteur>' . "\n";
}
spip_free_result($res2);
- $res2 = spip_query("SELECT id_document FROM spip_documents_articles WHERE id_article=".$row[0]);
+ $res2 = spip_query("SELECT id_document FROM spip_documents_articles WHERE id_article=".$row['id_article']);
while($row2 = spip_fetch_array($res2)) {
$string .= '<lien:document>' . $row2['id_document'] . '</lien:document>' . "\n";
@@ -171,7 +171,7 @@ function export_objets($table, $type, $file = 0, $gz = false, $etape_en_cours=""
spip_free_result($res2);
}
else if ($type == 'message') {
- $res2 = spip_query("SELECT id_auteur FROM spip_auteurs_messages WHERE id_message=".$row[0]);
+ $res2 = spip_query("SELECT id_auteur FROM spip_auteurs_messages WHERE id_message=".$row['id_message']);
while($row2 = spip_fetch_array($res2)) {
$string .= '<lien:auteur>' . $row2['id_auteur'] . '</lien:auteur>' . "\n";
@@ -179,7 +179,7 @@ function export_objets($table, $type, $file = 0, $gz = false, $etape_en_cours=""
spip_free_result($res2);
}
else if ($type == 'breve') {
- $res2 = spip_query("SELECT id_document FROM spip_documents_breves WHERE id_breve=".$row[0]);
+ $res2 = spip_query("SELECT id_document FROM spip_documents_breves WHERE id_breve=".$row['id_breve']);
while($row2 = spip_fetch_array($res2)) {
$string .= '<lien:document>' . $row2['id_document'] . '</lien:document>' . "\n";
@@ -187,13 +187,13 @@ function export_objets($table, $type, $file = 0, $gz = false, $etape_en_cours=""
spip_free_result($res2);
}
else if ($type == 'rubrique') {
- $res2 = spip_query("SELECT id_document FROM spip_documents_rubriques WHERE id_rubrique=".$row[0]);
+ $res2 = spip_query("SELECT id_document FROM spip_documents_rubriques WHERE id_rubrique=".$row['id_rubrique']);
while($row2 = spip_fetch_array($res2)) {
$string .= '<lien:document>' . $row2['id_document'] . '</lien:document>' . "\n";
}
spip_free_result($res2);
- $res2 = spip_query("SELECT id_auteur FROM spip_auteurs_rubriques WHERE id_rubrique=".$row[0]);
+ $res2 = spip_query("SELECT id_auteur FROM spip_auteurs_rubriques WHERE id_rubrique=".$row['id_rubrique']);
while($row2 = spip_fetch_array($res2)) {
$string .= '<lien:auteur>' . $row2['id_auteur'] . '</lien:auteur>' . "\n";
@@ -201,38 +201,38 @@ function export_objets($table, $type, $file = 0, $gz = false, $etape_en_cours=""
spip_free_result($res2);
}
else if ($type == 'auteur') {
- $res2 = spip_query("SELECT id_rubrique FROM spip_auteurs_rubriques WHERE id_auteur=".$row[0]);
+ $res2 = spip_query("SELECT id_rubrique FROM spip_auteurs_rubriques WHERE id_auteur=".$row['id_auteur']);
while($row2 = spip_fetch_array($res2)) {
$string .= '<lien:rubrique>' . $row2['id_rubrique'] . '</lien:rubrique>' . "\n";
}
spip_free_result($res2);
}
else if ($type == 'mot') {
- $res2 = spip_query("SELECT id_article FROM spip_mots_articles WHERE id_mot=".$row[0]);
+ $res2 = spip_query("SELECT id_article FROM spip_mots_articles WHERE id_mot=".$row['id_mot']);
while($row2 = spip_fetch_array($res2)) {
$string .= '<lien:article>' . $row2['id_article'] . '</lien:article>' . "\n";
}
spip_free_result($res2);
- $res2 = spip_query("SELECT id_breve FROM spip_mots_breves WHERE id_mot=".$row[0]);
+ $res2 = spip_query("SELECT id_breve FROM spip_mots_breves WHERE id_mot=".$row['id_mot']);
while($row2 = spip_fetch_array($res2)) {
$string .= '<lien:breve>' . $row2['id_breve'] . '</lien:breve>' . "\n";
}
spip_free_result($res2);
- $res3 = spip_query("SELECT id_forum FROM spip_mots_forum WHERE id_mot=".$row[0]);
+ $res3 = spip_query("SELECT id_forum FROM spip_mots_forum WHERE id_mot=".$row['id_mot']);
while($row3 = spip_fetch_array($res3)) {
$string .= '<lien:forum>' . $row3['id_forum'] . '</lien:forum>' . "\n";
}
spip_free_result($res3);
- $res4 = spip_query("SELECT id_rubrique FROM spip_mots_rubriques WHERE id_mot=".$row[0]);
+ $res4 = spip_query("SELECT id_rubrique FROM spip_mots_rubriques WHERE id_mot=".$row['id_mot']);
while($row4 = spip_fetch_array($res4)) {
$string .= '<lien:rubrique>' . $row4['id_rubrique'] . '</lien:rubrique>' . "\n";
}
spip_free_result($res4);
- $res4 = spip_query("SELECT id_syndic FROM spip_mots_syndic WHERE id_mot=".$row[0]);
+ $res4 = spip_query("SELECT id_syndic FROM spip_mots_syndic WHERE id_mot=".$row['id_mot']);
while($row4 = spip_fetch_array($res4)) {
$string .= '<lien:syndic>' . $row4['id_syndic'] . '</lien:syndic>' . "\n";
diff --git a/ecrire/exec/rubriques_edit.php b/ecrire/exec/rubriques_edit.php
index 5dd62ba2f2..01b4a8b965 100644
--- a/ecrire/exec/rubriques_edit.php
+++ b/ecrire/exec/rubriques_edit.php
@@ -115,7 +115,8 @@ echo selecteur_rubrique($id_parent, 'rubrique', $restreint, $id_rubrique);
// si c'est une rubrique-secteur contenant des breves, demander la
// confirmation du deplacement
- list($contient_breves) = spip_fetch_array(spip_query("SELECT COUNT(*) AS cnt FROM spip_breves WHERE id_rubrique='$id_rubrique' LIMIT 1"));
+ $contient_breves = spip_fetch_array(spip_query("SELECT COUNT(*) AS cnt FROM spip_breves WHERE id_rubrique='$id_rubrique' LIMIT 1"));
+ $contient_breves = $contient_breves['cnt'];
if ($contient_breves > 0) {
$scb = ($contient_breves>1? 's':'');
diff --git a/ecrire/inc/forum_insert.php b/ecrire/inc/forum_insert.php
index aa40d242e1..3320b60d59 100644
--- a/ecrire/inc/forum_insert.php
+++ b/ecrire/inc/forum_insert.php
@@ -202,8 +202,10 @@ function inc_forum_insert_dist() {
// Entrer le message dans la base
$id_message = spip_abstract_insert('spip_forum', '(date_heure)', '(NOW())');
- if ($id_forum)
- list($id_thread) = spip_fetch_array(spip_query("SELECT id_thread FROM spip_forum WHERE id_forum = $id_forum"));
+ if ($id_forum) {
+ $id_thread = spip_fetch_array(spip_query("SELECT id_thread FROM spip_forum WHERE id_forum = $id_forum"));
+ $id_thread = $id_thread['id_thread'];
+ }
else
$id_thread = $id_message; # id_thread oblige INSERT puis UPDATE.
diff --git a/ecrire/inc/indexation.php b/ecrire/inc/indexation.php
index 41d982e709..27a1c2ebdb 100644
--- a/ecrire/inc/indexation.php
+++ b/ecrire/inc/indexation.php
@@ -305,7 +305,8 @@ function indexer_contenu_document ($row) {
global $extracteur;
if ($row['mode'] == 'vignette') return;
- list($extension) = spip_fetch_array(spip_query("SELECT extension FROM spip_types_documents WHERE id_type = ".$row['id_type']));
+ $extension = spip_fetch_array(spip_query("SELECT extension FROM spip_types_documents WHERE id_type = ".$row['id_type']));
+ $extension = $extension['extension'];
// Voir si on sait lire le contenu (eventuellement en chargeant le
// fichier extract/pdf.php dans find_in_path() )
--
GitLab