summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-11-06 14:40:48 +0100
committerAndrey Andreev <narf@bofh.bg>2012-11-06 14:40:48 +0100
commitba77f8ae39bdbf456159cb48f75aea7127f9cbcd (patch)
tree0f80525e76843330e8f2c3fae44e1934e950bec0 /system
parent303eef056b7317a1e4f06feb26fdb452a59c3a51 (diff)
Fix issue #1978
Diffstat (limited to 'system')
-rw-r--r--system/helpers/directory_helper.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php
index 7223a2911..e90c92d79 100644
--- a/system/helpers/directory_helper.php
+++ b/system/helpers/directory_helper.php
@@ -47,9 +47,10 @@ if ( ! function_exists('directory_map'))
* representation of it. Sub-folders contained with the
* directory will be mapped as well.
*
- * @param string path to source
- * @param int depth of directories to traverse (0 = fully recursive, 1 = current dir, etc)
- * @param bool whether to show hidden files
+ * @param string $source_dir Path to source
+ * @param int $directory_depth Depth of directories to traverse
+ * (0 = fully recursive, 1 = current dir, etc)
+ * @param bool $hidden Whether to show hidden files
* @return array
*/
function directory_map($source_dir, $directory_depth = 0, $hidden = FALSE)
@@ -70,7 +71,8 @@ if ( ! function_exists('directory_map'))
if (($directory_depth < 1 OR $new_depth > 0) && @is_dir($source_dir.$file))
{
- $filedata[$file] = directory_map($source_dir.$file.DIRECTORY_SEPARATOR, $new_depth, $hidden);
+ $file .= DIRECTORY_SEPARATOR;
+ $filedata[$file] = directory_map($source_dir.$file, $new_depth, $hidden);
}
else
{