From ae097da160d697e37ad783ba8b6e9d578eb8e61d Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Fri, 27 Sep 2002 21:10:54 +0000
Subject: [PATCH] =?UTF-8?q?un=20peu=20de=20nettoyage=20et=20une=20p=C3=A9t?=
=?UTF-8?q?ouille=20graphique=20(l'encadr=C3=A9=20autour=20des=20trois=20b?=
=?UTF-8?q?locs=20=20FORUM=20PUBLIC=20=20P=C3=89TITION=20=20REDIRECTION?=
=?UTF-8?q?=C2=A0=C2=A0=20avait=20tendance=20=C3=A0=20baver=20vers=20le=20?=
=?UTF-8?q?bas)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/articles.php3 | 4 ++--
inc-calcul-squel.php3 | 11 +----------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/ecrire/articles.php3 b/ecrire/articles.php3
index e8a3114b6a..e57e34c7b1 100644
--- a/ecrire/articles.php3
+++ b/ecrire/articles.php3
@@ -602,6 +602,7 @@ if ($connect_statut=="0minirezo" AND $options=="avancees"){
echo "REDIRECTION";
echo aide ("artvirt");
echo "</b></font></td></tr></table></center>";
+ echo debut_block_invisible("virtuel");
echo "<form action='articles.php3' method='post'>";
echo "\n<INPUT TYPE='hidden' NAME='id_article' VALUE='$id_article'>";
echo "\n<INPUT TYPE='hidden' NAME='changer_virtuel' VALUE='oui'>";
@@ -610,7 +611,6 @@ if ($connect_statut=="0minirezo" AND $options=="avancees"){
echo "<INPUT TYPE='text' NAME='virtuel' CLASS='forml' style='font-size:9px;' VALUE=\"$virtuel\" SIZE='40'><br>";
}
- echo debut_block_invisible("virtuel");
if (strlen($virtuel) == 0) {
$virtuel = "http://";
echo "<INPUT TYPE='text' NAME='virtuel' CLASS='forml' style='font-size:9px;' VALUE=\"$virtuel\" SIZE='40'><br>";
@@ -1308,7 +1308,7 @@ echo "\n\n<DIV align=justify>";
if (substr($chapo, 0, 1) == '=') {
$adresse = substr($chapo, 1, strlen($chapo));
debut_boite_info();
- echo propre("{{Redirection.}} Cet article correspond à
+ echo propre("{{Redirection.}} Cet article renvoie à
la page: <center>[->$adresse]</center>");
fin_boite_info();
}
diff --git a/inc-calcul-squel.php3 b/inc-calcul-squel.php3
index de00becb6b..ab3fc87891 100644
--- a/inc-calcul-squel.php3
+++ b/inc-calcul-squel.php3
@@ -478,16 +478,7 @@ function parser_boucle($texte, $id_parent) {
break;
case 'mots':
- // Si aucun lien avec un article, et si pas de demande de "tout" les mots-cles
- // alors selectionner uniquement les mots-cles attaches a un article publie
-/* if (!$tout AND !$flag_lien) {
- $req_from[] = 'spip_mots_articles AS lien';
- $req_from[] = 'spip_articles AS articles';
- $req_where[] = "lien.id_mot=$table.id_mot";
- $req_where[] = "lien.id_article=articles.id_article";
- $req_where[] = "articles.statut='publie'";
- $req_group = " GROUP BY $table.$id_objet";
- }*/
+ // pas de restriction sur les mots
break;
case 'breves':
--
GitLab