From f9be4dc65656877d51c9456b9f429ab3846fb15c Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Sat, 4 Mar 2006 16:36:53 +0000
Subject: [PATCH] =?UTF-8?q?find=5Fin=5Fpath=20:=20accepter=20/var/shim/spi?=
=?UTF-8?q?pnet/=20dans=20$dossier=5Fsquelettes=20(pour=20g=C3=A9rer=20les?=
=?UTF-8?q?=20fichiers=20de=20lang,=20=C3=A9crits=20par=20trad-lang,=20sur?=
=?UTF-8?q?=20spip.net)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc/utils.php | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index 9506595050..61224f1888 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -632,17 +632,18 @@ function find_in_path ($filename) {
_DIR_RESTREINT
);
- // Ajouter les repertoires des plugins
+ // Ajouter les repertoires des plugins
foreach ($GLOBALS['plugins'] as $plug)
- array_unshift($path, _DIR_PLUGINS.$plug.'/');
+ array_unshift($path, _DIR_PLUGINS.$plug.'/');
- // Ajouter squelettes/
+ // Ajouter squelettes/
array_unshift($path, _DIR_RACINE.'squelettes/');
- // Et le(s) dossier(s) des squelettes nommes
+ // Et le(s) dossier(s) des squelettes nommes
if ($GLOBALS['dossier_squelettes'])
foreach (explode(':', $GLOBALS['dossier_squelettes']) as $d)
- array_unshift($path, _DIR_RACINE.$d.'/');
+ array_unshift($path,
+ ($d[0] == '/' ? '' : _DIR_RACINE) . $d . '/');
foreach ($path as $dir) {
// ajouter un / eventuellement manquant a la fin
--
GitLab