From dfd290d2c17842242cbaae03c154495d2c89881d Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sat, 20 Aug 2005 00:23:20 +0000
Subject: [PATCH] =?UTF-8?q?mauvaise=20association=20des=20mots-cl=C3=A9=20?=
=?UTF-8?q?(indie)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc_mots.php3 | 6 +++---
ecrire/mots_edit.php3 | 17 +++++++++--------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/ecrire/inc_mots.php3 b/ecrire/inc_mots.php3
index ed571b13ae..1666ae159b 100644
--- a/ecrire/inc_mots.php3
+++ b/ecrire/inc_mots.php3
@@ -228,7 +228,7 @@ function formulaire_mots($table, $id_objet, $nouv_mot, $supp_mot, $cherche_mot,
echo "<div style='width: 200px;'>";
$retour = urlencode($GLOBALS['clean_link']->getUrl());
$titre = urlencode($cherche_mot);
- icone_horizontale(_T('icone_creer_mot_cle'), "mots_edit.php3?new=oui&ajouter_id_article=$id_objet&titre=$titre&redirect=$retour", "mot-cle-24.gif", "creer.gif");
+ icone_horizontale(_T('icone_creer_mot_cle'), "mots_edit.php3?new=oui&ajouter_id_article=$id_objet&table=$table&id_table=$id_table&titre=$titre&redirect=$retour", "mot-cle-24.gif", "creer.gif");
echo "</div> ";
}
@@ -516,11 +516,11 @@ if (triangle) triangle.src = '" . _DIR_IMG_PACK . "deplierbas$spip_lang_rtl.gif'
}
}
- if ($table == 'articles' AND $connect_statut == '0minirezo' AND $flag_editable AND $options == "avancees") {
+ if ($connect_statut == '0minirezo' AND $flag_editable AND $options == "avancees") {
echo "<tr><td></td><td colspan='2'>";
echo "<div style='width: 200px;'>";
$retour = urlencode($GLOBALS['clean_link']->getUrl());
- icone_horizontale(_T('icone_creer_mot_cle'), "mots_edit.php3?new=oui&ajouter_id_article=$id_objet&redirect=$retour", "mot-cle-24.gif", "creer.gif");
+ icone_horizontale(_T('icone_creer_mot_cle'), "mots_edit.php3?new=oui&ajouter_id_article=$id_objet&table=$table&id_table=$id_table&redirect=$retour", "mot-cle-24.gif", "creer.gif");
echo "</div> ";
echo "</td></tr>";
}
diff --git a/ecrire/mots_edit.php3 b/ecrire/mots_edit.php3
index b6cc80ca9b..f7c17ef22c 100644
--- a/ecrire/mots_edit.php3
+++ b/ecrire/mots_edit.php3
@@ -32,17 +32,16 @@ if ($connect_statut == '0minirezo') {
if ($new == 'oui' && $id_groupe) {
$id_mot = spip_abstract_insert("spip_mots", '(id_groupe)', "($id_groupe)");
-
// ajouter le mot a l'article
if (settype($ajouter_id_article, 'integer') AND ($ajouter_id_article>0))
- spip_query("INSERT INTO spip_mots_articles (id_mot, id_article) VALUES ($id_mot, $ajouter_id_article)");
+ spip_query("INSERT INTO spip_mots_$table (id_mot, $id_table) VALUES ($id_mot, $ajouter_id_article)");
}
$titre_mot = addslashes($titre_mot);
$texte = addslashes($texte);
$descriptif = addslashes($descriptif);
$type = addslashes(corriger_caracteres($type));
- $result = spip_query("SELECT * FROM spip_groupes_mots WHERE id_groupe='$id_groupe'");
+ $result = spip_query("SELECT titre FROM spip_groupes_mots WHERE id_groupe='$id_groupe'");
if ($row = spip_fetch_array($result))
$type = addslashes(corriger_caracteres($row['titre']));
@@ -213,10 +212,12 @@ if ($connect_statut =="0minirezo"){
if ($id_mot)
echo "<INPUT TYPE='Hidden' NAME='id_mot' VALUE='$id_mot'>\n";
else if ($new=='oui')
- echo "<INPUT TYPE='Hidden' NAME='new' VALUE='oui'>\n";
- echo "<INPUT TYPE='Hidden' NAME='redirect' VALUE=\"$redirect\">\n";
- echo "<INPUT TYPE='Hidden' NAME='redirect_ok' VALUE='oui'>\n";
- echo "<INPUT TYPE='Hidden' NAME='ajouter_id_article' VALUE=\"$ajouter_id_article\">\n";
+ echo "<INPUT TYPE='Hidden' NAME='new' VALUE='oui' />\n";
+ echo "<INPUT TYPE='Hidden' NAME='redirect' VALUE=\"$redirect\" />\n";
+ echo "<INPUT TYPE='Hidden' NAME='redirect_ok' VALUE='oui' />\n";
+ echo "<INPUT TYPE='Hidden' NAME='table' VALUE='$table' />\n";
+ echo "<INPUT TYPE='Hidden' NAME='id_table' VALUE='$id_table' />\n";
+ echo "<INPUT TYPE='Hidden' NAME='ajouter_id_article' VALUE=\"$ajouter_id_article\" />\n";
$titre_mot = entites_html($titre_mot);
$descriptif = entites_html($descriptif);
@@ -225,7 +226,7 @@ if ($connect_statut =="0minirezo"){
echo "<B>"._T('info_titre_mot_cle')."</B> "._T('info_obligatoire_02');
echo aide ("mots");
- echo "<BR><INPUT TYPE='text' NAME='titre_mot' CLASS='formo' VALUE=\"$titre_mot\" SIZE='40' $onfocus>";
+ echo "<BR><INPUT TYPE='text' NAME='titre_mot' CLASS='formo' VALUE=\"$titre_mot\" SIZE='40' $onfocus />";
// dans le groupe...
$query_groupes = "SELECT * FROM spip_groupes_mots ORDER BY titre";
--
GitLab