diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php
index 78c86b4ab30e4409273fe5308ae7362a52a900e1..d1af96929414dd3e62ccaf1f3cb2b7131260c98b 100644
--- a/ecrire/exec/articles.php
+++ b/ecrire/exec/articles.php
@@ -1363,7 +1363,7 @@ function afficher_statut_articles($id_article, $rubrique_article, $statut_articl
if ($connect_statut == '0minirezo' AND acces_rubrique($rubrique_article)) {
- echo generer_url_post_ecrire("articles", "id_article=$id_article"),
+ echo generer_url_post_ecrire("articles", "id_article=$id_article&id_rubrique=$rubrique_article"),
debut_cadre_relief("", true),
"\n<center>", "<B>",_T('texte_article_statut'),"</B>",
"\n<SELECT NAME='statut_nouv' SIZE='1' CLASS='fondl'\n",
diff --git a/ecrire/exec/articles_edit.php b/ecrire/exec/articles_edit.php
index 409b84ef57e43079a169755883ce184393129ca9..30fba11d4919d1e5ec351be5fb3a2fb25752b3a4 100644
--- a/ecrire/exec/articles_edit.php
+++ b/ecrire/exec/articles_edit.php
@@ -113,8 +113,8 @@ function formulaire_articles_edit($id_article, $id_rubrique, $titre, $soustitre,
echo "\n<table cellpadding=0 cellspacing=0 border=0 width='100%'>";
echo "<tr width='100%'>";
echo "<td>";
- if ($lier_trad) icone(_T('icone_retour'), generer_url_ecrire("articles","id_article=$lier_trad"), "article-24.gif", "rien.gif");
- else icone(_T('icone_retour'), generer_url_ecrire("articles","id_article=$id_article"), "article-24.gif", "rien.gif");
+ if ($lier_trad) icone(_T('icone_retour'), generer_url_ecrire("articles","id_article=$lier_trad&id_rubrique=$id_rubrique"), "article-24.gif", "rien.gif");
+ else icone(_T('icone_retour'), generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique"), "article-24.gif", "rien.gif");
echo "</td>";
echo "<td>". http_img_pack('rien.gif', " ", "width='10'") . "</td>\n";
@@ -137,7 +137,7 @@ echo "<P><HR><P>";
$texte = entites_html($texte);
$ps = entites_html($ps);
- echo generer_url_post_ecrire("articles", ($id_article ? "id_article=$id_article" : ""),'formulaire');
+ echo generer_url_post_ecrire("articles", ($id_article ? "id_article=$id_article&id_rubrique=$id_rubrique" : ""),'formulaire');
if ($new == 'oui')
echo "<INPUT TYPE='Hidden' NAME='new' VALUE='oui'>";
diff --git a/ecrire/exec/articles_forum.php b/ecrire/exec/articles_forum.php
index 43a178011c9f4b17a37c32e628156cafc3523193..2ef4268bd884e734c59eb231e56199f204b50e8f 100644
--- a/ecrire/exec/articles_forum.php
+++ b/ecrire/exec/articles_forum.php
@@ -62,7 +62,7 @@ debut_droite();
echo "\n<table cellpadding=0 cellspacing=0 border=0 width='100%'>";
echo "<tr width='100%'>";
echo "<td>";
- icone(_T('icone_retour'), generer_url_ecrire("articles","id_article=$id_article"), "article-24.gif", "rien.gif");
+ icone(_T('icone_retour'), generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique"), "article-24.gif", "rien.gif");
echo "</td>";
echo "<td>" . http_img_pack('rien.gif', " ", "width='10'") ."</td>\n";
diff --git a/ecrire/exec/brouteur_frame.php b/ecrire/exec/brouteur_frame.php
index 8809ef183db034d5ae5630f9d436ce70a46c2913..f4402784c8b6b9f4686a51cb45f9f0c3ff0ea7fc 100644
--- a/ecrire/exec/brouteur_frame.php
+++ b/ecrire/exec/brouteur_frame.php
@@ -38,32 +38,34 @@ function exec_brouteur_frame_dist()
if ($special == "redac") {
- $query = "SELECT articles.id_article, articles.titre, articles.statut FROM spip_articles AS articles, spip_auteurs_articles AS lien WHERE articles.statut = 'prepa' AND articles.id_article = lien.id_article AND lien.id_auteur = $connect_id_auteur GROUP BY id_article ORDER BY articles.date DESC";
+ $query = "SELECT articles.id_article, articles.id_rubrique, articles.titre, articles.statut FROM spip_articles AS articles, spip_auteurs_articles AS lien WHERE articles.statut = 'prepa' AND articles.id_article = lien.id_article AND lien.id_auteur = $connect_id_auteur GROUP BY id_article ORDER BY articles.date DESC";
$result=spip_query($query);
if (spip_num_rows($result)>0) {
echo "<div style='padding-top: 6px; padding-bottom: 3px;'><b class='verdana2'>"._T("info_cours_edition")."</b></div>";
echo "<div class='plan-articles'>";
while($row=spip_fetch_array($result)){
$id_article=$row['id_article'];
+ $id_rubrique=$row['id_rubrique'];
$titre = typo($row['titre']);
$statut = $row['statut'];
- echo "<a class='$statut' href='javascript:window.parent.location=\"" . generer_url_ecrire('articles',"id_article=$id_article"),"\"'>",$titre,"</a>";
+ echo "<a class='$statut' href='javascript:window.parent.location=\"" . generer_url_ecrire('articles',"id_article=$id_article&id_rubrique=$id_rubrique"),"\"'>",$titre,"</a>";
}
echo "</div>";
}
}
else if ($special == "valider") {
- $query = "SELECT articles.id_article, articles.titre, articles.statut FROM spip_articles AS articles WHERE articles.statut = 'prop' ORDER BY articles.date DESC";
+ $query = "SELECT articles.id_article, article.id_rubrique, articles.titre, articles.statut FROM spip_articles AS articles WHERE articles.statut = 'prop' ORDER BY articles.date DESC";
$result=spip_query($query);
if (spip_num_rows($result)>0) {
echo "<div style='padding-top: 6px; padding-bottom: 3px;'><b class='verdana2'>"._T("info_articles_proposes")."</b></div>";
echo "<div class='plan-articles'>";
while($row=spip_fetch_array($result)){
$id_article=$row['id_article'];
+ $id_rubrique=$row['id_rubrique'];
$titre = typo($row['titre']);
$statut = $row['statut'];
- echo "<a class='$statut' href='javascript:window.parent.location=\"", generer_url_ecrire('articles',"id_article=$id_article"),"\"'>",$titre,"</a>";
+ echo "<a class='$statut' href='javascript:window.parent.location=\"", generer_url_ecrire('articles',"id_article=$id_article&id_rubrique=$id_rubrique"),"\"'>",$titre,"</a>";
}
echo "</div>";
}
@@ -136,17 +138,18 @@ onMouseOut=\"changeclass(this, 'brouteur_rubrique');\">";
if ($id_rubrique > 0) {
- if ($connect_statut == "0minirezo") $query = "SELECT articles.id_article, articles.titre, articles.statut FROM spip_articles AS articles WHERE id_rubrique=$id_rubrique ORDER BY date DESC";
- else $query = "SELECT articles.id_article, articles.titre, articles.statut FROM spip_articles AS articles, spip_auteurs_articles AS lien WHERE articles.id_rubrique=$id_rubrique AND (articles.statut = 'publie' OR articles.statut = 'prop' OR (articles.statut = 'prepa' AND articles.id_article = lien.id_article AND lien.id_auteur = $connect_id_auteur)) GROUP BY id_article ORDER BY articles.date DESC";
+ if ($connect_statut == "0minirezo") $query = "SELECT articles.id_article, articles.id_rubrique, articles.titre, articles.statut FROM spip_articles AS articles WHERE id_rubrique=$id_rubrique ORDER BY date DESC";
+ else $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_rubrique=$id_rubrique AND (articles.statut = 'publie' OR articles.statut = 'prop' OR (articles.statut = 'prepa' AND articles.id_article = lien.id_article AND lien.id_auteur = $connect_id_auteur)) GROUP BY id_article ORDER BY articles.date DESC";
$result=spip_query($query);
if (spip_num_rows($result)>0) {
echo "<div style='padding-top: 6px; padding-bottom: 3px;'><b class='verdana2'>"._T('info_articles')."</b></div>";
echo "<div class='plan-articles'>";
while($row=spip_fetch_array($result)){
$id_article=$row['id_article'];
+ $id_rubrique=$row['id_rubrique'];
$titre = typo($row['titre']);
$statut = $row['statut'];
- echo "<a class='$statut' href='javascript:window.parent.location=\"" . generer_url_ecrire('articles',"id_article=$id_article")."\"'>",$titre,"</a>";
+ echo "<a class='$statut' href='javascript:window.parent.location=\"" . generer_url_ecrire('articles',"id_article=$id_article&id_rubrique=$id_rubrique")."\"'>",$titre,"</a>";
}
echo "</div>";
}