summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-05-06 16:12:18 +0200
committerDerek Jones <derek.jones@ellislab.com>2008-05-06 16:12:18 +0200
commit2798b5033815f9165ad10137c0866b5fdb59ea54 (patch)
tree636308611e29de880c2c5e7caf7f368a245593cd /system
parentde7320bb78f02baa3b7cad3983d5b6d3a9c74f34 (diff)
fixed a bug where the dir resource was not closed in the directory helper, and made it more efficient
http://codeigniter.com/bug_tracker/bug/4206/
Diffstat (limited to 'system')
-rw-r--r--system/helpers/directory_helper.php15
1 files changed, 12 insertions, 3 deletions
diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php
index 5a23944cb..25c16c1fc 100644
--- a/system/helpers/directory_helper.php
+++ b/system/helpers/directory_helper.php
@@ -45,22 +45,31 @@ if (! function_exists('directory_map'))
{
if ($fp = @opendir($source_dir))
{
+ $source_dir = rtrim($source_dir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
$filedata = array();
+
while (FALSE !== ($file = readdir($fp)))
{
- if (@is_dir($source_dir.$file) && substr($file, 0, 1) != '.' AND $top_level_only == FALSE)
+ if (substr($file, 0, 1) == '.')
+ {
+ continue;
+ }
+
+ if ($top_level_only == FALSE && @is_dir($source_dir.$file))
{
$temp_array = array();
- $temp_array = directory_map($source_dir.$file."/");
+ $temp_array = directory_map($source_dir.$file.DIRECTORY_SEPARATOR);
$filedata[$file] = $temp_array;
}
- elseif (substr($file, 0, 1) != ".")
+ else
{
$filedata[] = $file;
}
}
+
+ closedir($fp);
return $filedata;
}
}