From d83718e2bc478dbd84126aed2e23c70117565ffd Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Tue, 9 Dec 2003 10:03:22 +0000
Subject: [PATCH] =?UTF-8?q?bug=20dans=20"perso.php3=20:=20=C3=A0=20cause?=
=?UTF-8?q?=20du=20include=5Fecire()=20il=20n'=C3=A9tait=20appel=C3=A9=20q?=
=?UTF-8?q?ue=20pour=20le=20premier=20module=20dans=20l'espace=20public=20?=
=?UTF-8?q?(module=20"local"=20ou=20"public",=20et=20donc=20pas=20apr?=
=?UTF-8?q?=C3=A8s=20le=20module=20"spip").?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc_lang.php3 | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/ecrire/inc_lang.php3 b/ecrire/inc_lang.php3
index 8a157102c4..004d983574 100644
--- a/ecrire/inc_lang.php3
+++ b/ecrire/inc_lang.php3
@@ -55,7 +55,8 @@ function charger_langue($lang, $module = 'spip', $forcer = false) {
// chercher dans le fichier cache ?
if (!$flag_ecrire AND $fichier_lang_exists) {
if (!$forcer AND @file_exists('CACHE/lang_'.$module.'_'.$lang.'.php3')
- AND (@filemtime('CACHE/lang_'.$module.'_'.$lang.'.php3') > @filemtime('ecrire/lang/'.$module.'_'.$lang.'.php3'))) {
+ AND (@filemtime('CACHE/lang_'.$module.'_'.$lang.'.php3') > @filemtime('ecrire/lang/'.$module.'_'.$lang.'.php3'))
+ AND (@filemtime('CACHE/lang_'.$module.'_'.$lang.'.php3') > @filemtime('ecrire/lang/perso.php3'))) {
$GLOBALS['idx_lang'] = 'i18n_'.$module.'_'.$lang;
return include_local('CACHE/lang_'.$module.'_'.$lang.'.php3');
}
@@ -78,8 +79,8 @@ function charger_langue($lang, $module = 'spip', $forcer = false) {
}
// surcharge perso
- if (file_exists($dir_ecrire.'lang/perso.php3')) {
- include_ecrire('lang/perso.php3');
+ if (@file_exists($dir_ecrire.'lang/perso.php3')) {
+ include($dir_ecrire.'lang/perso.php3');
}
}
--
GitLab