From 26c75ea683eedeb138a9dda0f98d0f1aa6a3bcd5 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Sat, 10 Jun 2006 10:50:11 +0000
Subject: [PATCH] =?UTF-8?q?le=20squelette=20principal=20etait=20tjours=20c?=
 =?UTF-8?q?alcul=C3=A9=20faute=20de=20la=20presence=20de=20$page['contexte?=
 =?UTF-8?q?'].=20Les=20INLCURE=20n'etaient=20pas=20affect=C3=A9s.=20Bug=20?=
 =?UTF-8?q?introduit=20dans=20[6402]=20=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecrire/public/assembler.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ecrire/public/assembler.php b/ecrire/public/assembler.php
index 2b7b3c19fd..3363acf953 100644
--- a/ecrire/public/assembler.php
+++ b/ecrire/public/assembler.php
@@ -115,10 +115,12 @@ function assembler_page ($fond) {
 		$page['entetes']["Connection"] = "close";
 		$page['texte'] = "";
 	} else {
-	  if (!$use_cache && isset($page['contexte']))  {
-// Remplir les globals pour les boutons d'admin
-			foreach ($page['contexte'] as $var=>$val)
-				$GLOBALS[$var] = $val;
+		if (!$use_cache )  {
+			if (isset($page['contexte'])){
+				// Remplir les globals pour les boutons d'admin
+				foreach ($page['contexte'] as $var=>$val)
+					$GLOBALS[$var] = $val;
+			}
 		} else {
 			$f = charger_fonction('parametrer', 'public');
 			$page = $f($fond, '', $chemin_cache);
-- 
GitLab