diff --git a/ecrire/action/editer_article.php b/ecrire/action/editer_article.php index b7f4aab58f39ce522ceb8bebd9f4a72b6eae75fe..8ea000abba091f23ab67be71ba9f61a8e2866502 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 833f623d368e1677235fc0c9b6611230e157888d..5a8ef4917a1d75f4445d4ab63f34f5e0de4dd92c 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') {