From e1caa925d25c1ec766c91760a2d24b68dd9a9943 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Mon, 2 Oct 2006 21:06:44 +0000
Subject: [PATCH] lier_trad est un _request comme les autres
---
ecrire/action/editer_article.php | 6 +++---
ecrire/public/assembler.php | 10 ++++++----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ecrire/action/editer_article.php b/ecrire/action/editer_article.php
index b7f4aab58f..8ea000abba 100644
--- a/ecrire/action/editer_article.php
+++ b/ecrire/action/editer_article.php
@@ -28,7 +28,7 @@ function action_editer_article_dist() {
}
// Enregistre l'envoi dans la BD
- $err = articles_set($id_article, $arg=='oui', _request('lier_trad'));
+ $err = articles_set($id_article, $arg=='oui');
$redirect = parametre_url(urldecode(_request('redirect')),
'id_article', $id_article, '&') . ($err ? '&trad_err=1' : '');
@@ -77,7 +77,7 @@ function insert_article($id_rubrique) {
}
// http://doc.spip.org/@articles_set
-function articles_set($id_article, $new, $lier_trad) {
+function articles_set($id_article, $new) {
include_spip('inc/filtres');
include_spip('inc/rubriques');
@@ -87,7 +87,7 @@ function articles_set($id_article, $new, $lier_trad) {
}
// Un lien de trad a prendre en compte
- if ($lier_trad)
+ if ($lier_trad = _request('lier_trad'))
$err = article_referent($id_article, $lier_trad);
return $err;
diff --git a/ecrire/public/assembler.php b/ecrire/public/assembler.php
index 833f623d36..5a8ef4917a 100644
--- a/ecrire/public/assembler.php
+++ b/ecrire/public/assembler.php
@@ -262,10 +262,12 @@ function inclure_balise_dynamique($texte, $echo=true, $ligne=0) {
// mais pas toutes
unset($page['entetes']['X-Spip-Cache']);
unset($page['entetes']['Content-Type']);
- if (!is_array($GLOBALS['page']['entetes']))
- $GLOBALS['page']['entetes'] = array();
- $GLOBALS['page']['entetes'] =
- array_merge($GLOBALS['page']['entetes'],$page['entetes']);
+ if (is_array($GLOBALS['page'])) {
+ if (!is_array($GLOBALS['page']['entetes']))
+ $GLOBALS['page']['entetes'] = array();
+ $GLOBALS['page']['entetes'] =
+ array_merge($GLOBALS['page']['entetes'],$page['entetes']);
+ }
}
if ($page['process_ins'] == 'html') {
--
GitLab