diff --git a/ecrire/inc_utils.php b/ecrire/inc_utils.php index f4525651d13d6cd493a170cb0e78a015f148f266..cb27fa47dd5093ac1fab6c85d330967f094ac8a1 100644 --- a/ecrire/inc_utils.php +++ b/ecrire/inc_utils.php @@ -577,11 +577,11 @@ function find_in_path ($filename, $path='AUTO', $sinon='') { // Ajouter les repertoires des plugins foreach ($GLOBALS['plugins'] as $plug) $autopath = _DIR_PLUGINS.$plug.'/:'.$autopath; - - if ($GLOBALS['dossier_squelettes']) - $autopath = $GLOBALS['dossier_squelettes'].'/:'.$autopath; } $path = $autopath; + + if ($GLOBALS['dossier_squelettes']) + $path = $GLOBALS['dossier_squelettes'].'/:'.$path; } #spip_log("path = $path"); diff --git a/inc-calcul.php3 b/inc-calcul.php3 index 3971c6a768f4f7e4e14160d7de7d106811a93772..eab33923d8be593955ecec1284fedecfdc74ee00 100644 --- a/inc-calcul.php3 +++ b/inc-calcul.php3 @@ -30,8 +30,11 @@ include_ecrire("inc_distant"); include_local("inc-calcul-outils"); // NB: Ce fichier peut initialiser $dossier_squelettes (old-style) -if ($f = find_in_path("mes_fonctions" . _EXTENSION_PHP)) - include_local ($f); +// donc il faut l'inclure "en globals" +if ($f = find_in_path("mes_fonctions" . _EXTENSION_PHP)) { + global $dossier_squelettes; + include ($f); +} charger_generer_url();