From de3bdbfcf2cce4a0bc6e44c7b91c886942ad69e8 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Fri, 3 Mar 2006 13:12:21 +0000
Subject: [PATCH] =?UTF-8?q?Poursuite=20de=20[5841]=20:=20mettre=20id=5Frub?=
=?UTF-8?q?rique=20dans=20l'URL=20pour=20que=20les=20cr=C3=A9ations=20aien?=
=?UTF-8?q?t=20toujours=20lieu=20dans=20la=20rubrique=20affich=C3=A9e=20da?=
=?UTF-8?q?ns=20la=20hi=C3=A9rarchie.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc/presentation.php | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index c3be03e362..0a16079a9a 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -854,7 +854,8 @@ function afficher_articles($titre_table, $requete, $afficher_visites = false, $a
if (acces_restreint_rubrique($id_rubrique))
$s .= http_img_pack("admin-12.gif", "", "width='12' height='12'", _T('titre_image_admin_article'));
- $s .= "<a href='" . generer_url_ecrire("articles","id_article=$id_article") . "'$descriptif$dir_lang style=\"display:block;\">";
+ $s .= "<a href='" . generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique") .
+ "'$descriptif$dir_lang style=\"display:block;\">";
if ($voir_logo) $s .= baliser_logo("art", $id_article, 26, 20);
$s .= typo($titre);
@@ -1051,20 +1052,20 @@ function afficher_articles_trad($titre_table, $requete, $afficher_visites = fals
while (list(,$k) = each($langues_site)) {
if ($langues_art[$k]) {
if ($langues_art[$k] == $id_trad) {
- $span_lang = "<a href='" . generer_url_ecrire("articles","id_article=".$langues_art[$k]) . "'><span class='lang_base'>$k</a></a>";
+ $span_lang = "<a href='" . generer_url_ecrire("articles","id_article=".$langues_art[$k] . "&id_rubrique=$id_rubrique") . "'><span class='lang_base'>$k</a></a>";
$l .= $span_lang;
} else {
$date = $dates_art[$k];
if ($date < $date_ref)
- $l .= "<a href='" . generer_url_ecrire("articles","id_article=".$langues_art[$k]) . "' class='claire'>$k</a>";
- else $l .= "<a href='" . generer_url_ecrire("articles","id_article=".$langues_art[$k]) . "' class='foncee'>$k</a>";
+ $l .= "<a href='" . generer_url_ecrire("articles","id_article=".$langues_art[$k] . "&id_rubrique=$id_rubrique") . "' class='claire'>$k</a>";
+ else $l .= "<a href='" . generer_url_ecrire("articles","id_article=".$langues_art[$k] . "&id_rubrique=$id_rubrique") . "' class='foncee'>$k</a>";
}
}
# else $l.= "<span class='creer'>$k</span>";
}
if (!$span_lang)
- $span_lang = "<a href='" . generer_url_ecrire("articles","id_article=$id_article") . "'><span class='lang_base'>$lang</a></a>";
+ $span_lang = "<a href='" . generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique") . "'><span class='lang_base'>$lang</a></a>";
$vals[] = "<div style='text-align: center;'>$span_lang</div>";
@@ -1076,7 +1077,7 @@ function afficher_articles_trad($titre_table, $requete, $afficher_visites = fals
if (acces_restreint_rubrique($id_rubrique))
$s .= http_img_pack("admin-12.gif", "", "width='12' height='12'", _T('titre_image_admin_article'));
- $s .= "<a href='" . generer_url_ecrire("articles","id_article=$id_article") . "'$descriptif$dir_lang style=\"display:block;\">";
+ $s .= "<a href='" . generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique") . "'$descriptif$dir_lang style=\"display:block;\">";
if ($id_article == $id_trad) $titre = "<b>$titre</b>";
@@ -2485,7 +2486,7 @@ if (true /*$gadgets*/) {
echo "</a>";
$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 ".
+ $vos_articles = spip_query("SELECT articles.id_article, articles.id_rubrique, 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");
if (spip_num_rows($vos_articles) > 0) {
$gadget .= "<div> </div>";
@@ -2496,13 +2497,13 @@ if (true /*$gadgets*/) {
$id_article = $row['id_article'];
$titre = typo(sinon($row['titre'], _T('ecrire:info_sans_titre')));
$statut = $row['statut'];
- $gadget .= "<a class='$statut' style='font-size: 10px;' href='" . generer_url_ecrire("articles","id_article=$id_article") . "'>$titre</a>\n";
+ $gadget .= "<a class='$statut' style='font-size: 10px;' href='" . generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique") . "'>$titre</a>\n";
}
$gadget .= "</div>";
$gadget .= "</div>";
}
- $vos_articles = spip_query("SELECT articles.id_article, articles.titre, articles.statut FROM spip_articles AS articles WHERE articles.statut='prop' ".
+ $vos_articles = spip_query("SELECT articles.id_article, articles.id_rubrique, articles.titre, articles.statut FROM spip_articles AS articles WHERE articles.statut='prop' ".
" ORDER BY articles.date DESC LIMIT 5");
if (spip_num_rows($vos_articles) > 0) {
$gadget .= "<div> </div>";
@@ -2514,7 +2515,7 @@ if (true /*$gadgets*/) {
$titre = sinon($row['titre'], _T('ecrire:info_sans_titre'));
$statut = $row['statut'];
- $gadget .= "<a class='$statut' style='font-size: 10px;' href='" . generer_url_ecrire("articles","id_article=$id_article") . "'>$titre</a>";
+ $gadget .= "<a class='$statut' style='font-size: 10px;' href='" . generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique") . "'>$titre</a>";
}
$gadget .= "</div>";
$gadget .= "</div>";
@@ -2925,7 +2926,7 @@ function debut_droite($rubrique="") {
if ($options == "avancees") {
// liste des articles bloques
if ($GLOBALS['meta']["articles_modif"] != "non") {
- $query = "SELECT id_article, titre FROM spip_articles WHERE auteur_modif = '$connect_id_auteur' AND date_modif > DATE_SUB(NOW(), INTERVAL 1 HOUR) ORDER BY date_modif DESC";
+ $query = "SELECT id_article, titre, id_rubrique FROM spip_articles WHERE auteur_modif = '$connect_id_auteur' AND date_modif > DATE_SUB(NOW(), INTERVAL 1 HOUR) ORDER BY date_modif DESC";
$result = spip_query($query);
$num_articles_ouverts = spip_num_rows($result);
if ($num_articles_ouverts) {
@@ -2949,7 +2950,7 @@ function debut_droite($rubrique="") {
}
echo "<div style='padding: 3px; background-color: $couleur;'>";
- echo "<div class='verdana1'><b><a href='" . generer_url_ecrire("articles","id_article=$ze_article") . "'>$ze_titre</a></div></b>";
+ echo "<div class='verdana1'><b><a href='" . generer_url_ecrire("articles","id_article=$ze_article&id_rubrique=$id_rubrique") . "'>$ze_titre</a></div></b>";
// ne pas proposer de debloquer si c'est l'article en cours d'edition
if ($ze_article != $GLOBALS['id_article_bloque']) {
--
GitLab