diff --git a/inc-public-global.php3 b/inc-public-global.php3 index 552b7a11e89edacd20db35b4ce4657416c9f3080..86a486c785832e4b05273ae9b4c49cd15aee670d 100644 --- a/inc-public-global.php3 +++ b/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(); + } } diff --git a/inc-public.php3 b/inc-public.php3 index 99725bc550d6708bf4cf972bdb98fb57435948dc..f18d6b032f62b39e29439cb64c59b8f3cf95e9ac 100644 --- a/inc-public.php3 +++ b/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');