From ac76a87de67defc7b61b27d25e2d65d6328cf5ce Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sun, 24 Sep 2006 11:34:59 +0000
Subject: [PATCH] =?UTF-8?q?Suite=20[7461]:=20diff=C3=A9rencier=20le=20Titl?=
=?UTF-8?q?e=20des=20flux=20RSS=20des=20admins=20restreints.=20Et=20une=20?=
=?UTF-8?q?p=C3=A9touille=20graphique=20en=20moins=20dans=20la=20messageri?=
=?UTF-8?q?e.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/action/rss.php | 8 +++++++-
ecrire/inc/message_select.php | 11 ++++++-----
ecrire/inc/presentation.php | 2 +-
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ecrire/action/rss.php b/ecrire/action/rss.php
index 99fcfc6053..09b501afff 100644
--- a/ecrire/action/rss.php
+++ b/ecrire/action/rss.php
@@ -399,26 +399,32 @@ switch($op) {
include_spip('inc/forum');
if ($id = intval($a['id_article'])) {
$critere = "statut='publie' AND id_article=$id";
+ $r = spip_fetch_array(spip_query("SELECT titre FROM spip_articles WHERE id_article=$id"));
$url = generer_url_article($id);
}
else if ($id = intval($a['id_syndic'])) {
$critere = "statut='publie' AND id_syndic=$id";
+ $r = spip_fetch_array(spip_query("SELECT nom_site AS titre FROM spip_syndic WHERE id_article=$id"));
$url = generer_url_site($id);
}
else if ($id = intval($a['id_breve'])) {
$critere = "statut='publie' AND id_breve=$id";
+ $r = spip_fetch_array(spip_query("SELECT titre FROM spip_articles WHERE id_article=$id"));
$url = generer_url_breve($id);
}
else if ($id = intval($a['id_rubrique'])) {
$critere = "statut='publie' AND id_rubrique=$id";
+ $r = spip_fetch_array(spip_query("SELECT titre FROM spip_articles WHERE id_article=$id"));
$url = generer_url_rubrique($id);
}
else if ($id = intval($a['id_thread'])) {
$critere = "statut='publie' AND id_thread=$id";
+ $r = spip_fetch_array(spip_query("SELECT titre FROM spip_articles WHERE id_article=$id"));
$url = generer_url_forum($id);
}
if ($id) $rss = rss_suivi_forums($a, "spip_forum", $critere, false);
- $title = _T("ecrire:titre_page_forum_suivi");
+
+ $title = $r['titre'] . ' (' . _T("ecrire:titre_page_forum_suivi") .')';
break;
# suivi prive des forums
case 'forums':
diff --git a/ecrire/inc/message_select.php b/ecrire/inc/message_select.php
index c637a77aad..4cfd21aef2 100644
--- a/ecrire/inc/message_select.php
+++ b/ecrire/inc/message_select.php
@@ -32,13 +32,14 @@ function afficher_messages($titre, $from, $where, &$messages_vus, $afficher_aute
$styles = array('arial2', 'arial1', 'arial1');
}
- if ($important) #debut_cadre_couleur();
- echo "<div class='cadre-couleur'><div class='cadre-padding'>";
-
$t = affiche_tranche_bandeau($requete, "messagerie-24.gif", $col, $couleur_foncee, "white", $tmp_var, $titre, false, $largeurs, $styles, 'afficher_message_boucles', $afficher_auteurs);
- foreach ($t as $v) $messages_vus[$v]= $v;
- if ($important) echo '</div></div>';#fin_cadre_couleur();
+ if ($t) {
+ if ($important) #debut_cadre_couleur();
+ echo "<div class='cadre-couleur'><div class='cadre-padding'>";
+ foreach ($t as $v) $messages_vus[$v]= $v;
+ if ($important) echo '</div></div>';#fin_cadre_couleur();
+ }
}
// http://doc.spip.org/@afficher_message_boucles
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index 3c7839dddd..9edf04d2d4 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -2842,7 +2842,7 @@ function bouton_spip_rss($op, $args, $fmt='rss') {
return "<a href='"
. $url
. "'>"
- . http_img_pack('feed.png', $button, '')
+ . http_img_pack('feed.png', $button, 'RSS', 'RSS')
. "</a>";
}
--
GitLab