From bb686a04482eb63b7d60d01b6644ef7292c2578b Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sun, 13 Feb 2005 16:20:11 +0000
Subject: [PATCH] =?UTF-8?q?tester=20is=5Fdir($dir)=20puis=20file=5Fexists(?=
=?UTF-8?q?"$racine$dir/$f")=20n=20est=20pas=20d=C3=A9mesur=C3=A9ment=20co?=
=?UTF-8?q?h=C3=A9rent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc_version.php3 | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/ecrire/inc_version.php3 b/ecrire/inc_version.php3
index 53c4937a36..9cac32691f 100644
--- a/ecrire/inc_version.php3
+++ b/ecrire/inc_version.php3
@@ -1143,24 +1143,22 @@ function texte_script($texte) {
//
function find_in_path ($filename, $path='AUTO') {
// Chemin standard depuis l'espace public
+
if ($path == 'AUTO') {
$path = '.:squelettes:dist:formulaires';
if ($GLOBALS['dossier_squelettes'])
$path = $GLOBALS['dossier_squelettes'].':'.$path;
}
- // Depuis l'espace prive, remonter d'un cran (a ameliorer si 'AUTO')
+ // Depuis l'espace prive, remonter d'un cran
$racine = (_DIR_RESTREINT ? '' : '../');
// Parcourir le chemin
foreach (split(':', $path) as $dir) {
- #spip_log ("test $path for $filename");
- if (@is_dir($dir) AND @file_exists("$racine$dir/$filename")) {
- #spip_log("$dir/$filename");
- return "$racine$dir/$filename";
+ $f = "$racine$dir/$filename";
+ if (@is_readable($f))
+ return $f;
}
- }
-
# spip_log("find_in_path: pas de fichier '$filename' sur le chemin '$path'");
}
--
GitLab