From 97aa9d23229dc36756d4a8635b19479dc8b66338 Mon Sep 17 00:00:00 2001 From: Fil <fil@rezo.net> Date: Wed, 4 Jul 2007 14:24:59 +0000 Subject: [PATCH] recuperer les fichiers dans le repertoire local '' (vraie raison du bug [9669]) --- ecrire/inc/utils.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php index 32b8a15507..a33d0e4fea 100644 --- a/ecrire/inc/utils.php +++ b/ecrire/inc/utils.php @@ -285,8 +285,6 @@ function set_request($var, $val = NULL, $c=false) { // Exemples : [(#SELF|parametre_url{suite,18})] (ajout) // [(#SELF|parametre_url{suite,''})] (supprime) // [(#SELF|parametre_url{suite})] (prend $suite dans la _request) -// http://www.spip.net/@parametre_url -// // http://doc.spip.org/@parametre_url function parametre_url($url, $c, $v=NULL, $sep='&') { @@ -683,6 +681,9 @@ function creer_chemin() { // http://doc.spip.org/@memoriser_fichiers function memoriser_fichiers($dir) { $fichiers = array(); + + if ($dir === '') $dir = '.'; + if (@is_dir($dir) AND $t = @opendir($dir)) { while (($f = readdir($t)) !== false) { @@ -695,7 +696,6 @@ function memoriser_fichiers($dir) { // http://doc.spip.org/@find_in_path function find_in_path ($filename) { static $ram; - $dirs = creer_chemin(); $a = strrpos($filename,'/'); if ($a === false) { @@ -705,7 +705,7 @@ function find_in_path ($filename) { $dirname = substr($filename, 0, $a+1); $basename = substr($filename, $a+1); } - foreach($dirs as $dir) { + foreach(creer_chemin() as $dir) { $sous = $dir.$dirname; if (!isset($ram[$sous])) $ram[$sous] = memoriser_fichiers($sous); -- GitLab