diff --git a/ecrire/action/rss.php b/ecrire/action/rss.php index 99fcfc6053684a321faf583706f7f4f54e47cdad..09b501afffe07923e979b0339006382f8106ecfe 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 c637a77aad9171199316fee556637384188e15af..4cfd21aef255595159704df515ca88ce1159f7d5 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 3c7839dddd36fe0d890827f0852fe06408a8b99d..9edf04d2d49aaf8958ee454932d8da4be63b5e17 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>"; }