From c6f4f2b2a83d8c226552d7f9696915785e7c47e0 Mon Sep 17 00:00:00 2001
From: James <james@rezo.net>
Date: Fri, 17 Mar 2006 09:58:58 +0000
Subject: [PATCH] =?UTF-8?q?remettre=20id=5Frubrique=20l=C3=A0=20o=C3=B9=20?=
=?UTF-8?q?il=20n'est=20pas=20superflu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/exec/articles.php | 4 ++--
ecrire/exec/articles_edit.php | 2 +-
ecrire/exec/articles_forum.php | 2 +-
ecrire/exec/articles_versions.php | 2 +-
ecrire/exec/breves_edit.php | 2 +-
ecrire/exec/breves_voir.php | 2 +-
ecrire/exec/sites.php | 2 +-
ecrire/exec/sites_edit.php | 2 +-
ecrire/inc/presentation.php | 7 +++----
9 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php
index 9825b90d93..969add82d0 100644
--- a/ecrire/exec/articles.php
+++ b/ecrire/exec/articles.php
@@ -77,11 +77,11 @@ if (ereg("([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2})", $date, $regs)
$jour = $regs[3];
$heure = $regs[4];
$minute = $regs[5];
- }
+}
-debut_page("« $titre_article »", "documents", "articles");
+debut_page("« $titre_article »", "documents", "articles", "", "", $id_rubrique);
debut_grand_cadre();
diff --git a/ecrire/exec/articles_edit.php b/ecrire/exec/articles_edit.php
index d4d8824d13..d216f48c12 100644
--- a/ecrire/exec/articles_edit.php
+++ b/ecrire/exec/articles_edit.php
@@ -275,7 +275,7 @@ echo "<P><HR><P>";
function exec_affiche_articles_edit_dist($flag_editable, $id_article, $id_rubrique, $titre, $soustitre, $surtitre, $descriptif, $url, $chapo, $texte, $ps, $new, $nom_site, $url_site, $extra, $id_secteur, $date, $onfocus, $lier_trad, $champs_article)
{
global $champs_extra;
-debut_page(_T('titre_page_articles_edit', array('titre' => $titre)), "documents", "articles", "hauteurTextarea();");
+debut_page(_T('titre_page_articles_edit', array('titre' => $titre)), "documents", "articles", "hauteurTextarea();", "", $id_rubrique);
debut_grand_cadre();
diff --git a/ecrire/exec/articles_forum.php b/ecrire/exec/articles_forum.php
index 0690d4cdd9..d8b9b7a947 100644
--- a/ecrire/exec/articles_forum.php
+++ b/ecrire/exec/articles_forum.php
@@ -33,7 +33,7 @@ function exec_articles_forum_dist()
$id_rubrique = $row["id_rubrique"];
}
- debut_page($titre, "documents", "articles");
+ debut_page($titre, "documents", "articles", "", "", $id_rubrique);
articles_forum_cadres($id_rubrique, $titre, 'articles', "id_article=$id_article");
diff --git a/ecrire/exec/articles_versions.php b/ecrire/exec/articles_versions.php
index 6466e8c779..9f803a367a 100644
--- a/ecrire/exec/articles_versions.php
+++ b/ecrire/exec/articles_versions.php
@@ -111,7 +111,7 @@ foreach ($textes as $var => $t) $$var = $t;
-debut_page(_T('info_historique')." « $titre »", "documents", "articles");
+debut_page(_T('info_historique')." « $titre »", "documents", "articles", "", "", $id_rubrique);
debut_grand_cadre();
diff --git a/ecrire/exec/breves_edit.php b/ecrire/exec/breves_edit.php
index c9d9819df0..67575c13d5 100644
--- a/ecrire/exec/breves_edit.php
+++ b/ecrire/exec/breves_edit.php
@@ -58,7 +58,7 @@ else {
}
-debut_page(_T('titre_page_breves_edit', array('titre' => $titre)), "documents", "breves");
+debut_page(_T('titre_page_breves_edit', array('titre' => $titre)), "documents", "breves", "", "", $id_rubrique);
debut_grand_cadre();
diff --git a/ecrire/exec/breves_voir.php b/ecrire/exec/breves_voir.php
index 20796ba2fc..b2a43cf37e 100644
--- a/ecrire/exec/breves_voir.php
+++ b/ecrire/exec/breves_voir.php
@@ -43,7 +43,7 @@ while ($row = spip_fetch_array($result)) {
$flag_editable = (($connect_statut == '0minirezo' AND acces_rubrique($id_rubrique)) OR $statut == 'prop');
-debut_page("« $titre_breve »", "documents", "breves");
+debut_page("« $titre_breve »", "documents", "breves", "", "", $id_rubrique);
debut_grand_cadre();
diff --git a/ecrire/exec/sites.php b/ecrire/exec/sites.php
index db359a0d66..bc493f8551 100644
--- a/ecrire/exec/sites.php
+++ b/ecrire/exec/sites.php
@@ -265,7 +265,7 @@ else
-debut_page("$titre_page","documents","sites");
+debut_page("$titre_page","documents","sites", "", "", $id_rubrique);
//////// parents
diff --git a/ecrire/exec/sites_edit.php b/ecrire/exec/sites_edit.php
index a6b9696c8b..c674565ce5 100644
--- a/ecrire/exec/sites_edit.php
+++ b/ecrire/exec/sites_edit.php
@@ -37,7 +37,7 @@ else {
}
-debut_page(_T('info_site_reference_2'), "documents", "sites");
+debut_page(_T('info_site_reference_2'), "documents", "sites", "", "", $id_rubrique);
debut_grand_cadre();
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index c4f4e0bdcb..b9b9574d0c 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -2138,11 +2138,11 @@ document.write(\"" . addslashes(strtr($html, "\n\r", " "))."\")");
// Presentation de l'interface privee, debut du HTML
//
-function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivre", $onLoad = "", $css="") {
+function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivre", $onLoad = "", $css="", $id_rubrique = "") {
init_entete($titre, $rubrique, $css);
definir_barre_boutons();
- init_body($rubrique, $sous_rubrique, $onLoad);
+ init_body($rubrique, $sous_rubrique, $onLoad, $id_rubrique);
debut_corps_page();
}
@@ -2172,7 +2172,7 @@ function init_entete($titre, $rubrique, $css='') {
}
// fonction envoyant la double serie d'icones de redac
-function init_body($rubrique='asuivre', $sous_rubrique='asuivre', $onLoad='') {
+function init_body($rubrique='asuivre', $sous_rubrique='asuivre', $onLoad='', $id_rubrique='') {
global $couleur_foncee, $couleur_claire, $adresse_site;
global $connect_id_auteur;
global $connect_statut;
@@ -2181,7 +2181,6 @@ function init_body($rubrique='asuivre', $sous_rubrique='asuivre', $onLoad='') {
global $options, $spip_display, $spip_ecran;
global $spip_lang, $spip_lang_rtl, $spip_lang_left, $spip_lang_right;
global $browser_verifForm;
- global $id_rubrique;
$id_rubrique = intval($id_rubrique);
--
GitLab