bug <INCLURE> et acces aux variables globales (Pierre Andrews)

inc-public-global.php3

@@ -404,19 +404,18 @@ function inclure_balise_dynamique($r) {
 		($GLOBALS['spip_lang'] != lire_meta('langue_site')))
 			$contexte_inclus['lang'] = $GLOBALS['spip_lang'];
 
-		inclure_page_lang($fond, $delais, $contexte_inclus);
-	}
-}
 
-function inclure_page_lang($fond, $delais, $contexte_inclus) {
-	$page = inclure_page($fond, $delais, $contexte_inclus);
-	if ($page['process_ins'] == 'html')
-		echo $page['texte'];
-	else
-		eval('?' . '>' . $page['texte']);
+		// Appeler la page
+		$page = inclure_page($fond, $delais, $contexte_inclus);
+		if ($page['process_ins'] == 'html')
+			echo $page['texte'];
+		else
+			eval('?' . '>' . $page['texte']);
+
+		if ($page['lang_select'])
+			lang_dselect();
 
-	if ($page['lang_select'])
-		lang_dselect();
+	}
 }
 
 

inc-public.php3

@@ -3,9 +3,17 @@
 
 // Distinguer une inclusion d'un appel initial
 
-if (function_exists('inclure_page_lang'))
-	inclure_page_lang($fond, $delais, $contexte_inclus);
-else {
+if (defined("_INC_PUBLIC_GLOBAL")) {
+	$page = inclure_page($fond, $delais, $contexte_inclus);
+	if ($page['process_ins'] == 'html')
+		echo $page['texte'];
+	else
+		eval('?' . '>' . $page['texte']);
+
+	if ($page['lang_select'])
+		lang_dselect();
+
+} else {
 	define ("_INC_PUBLIC", 1);
 	include ("ecrire/inc_version.php3");
 	include_local('inc-public-global.php3');