From ac7c81e3cd8891d7a8103c121911f7192b5027af Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 1 Apr 2008 13:59:49 +0000 Subject: Modified get_filenames() to use DIRECTORY_SEPARATOR constant instead of '/' for better cross-platform compatibility --- system/helpers/file_helper.php | 4 ++-- user_guide/changelog.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index e1a4ff31a..04c5747bf 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -175,14 +175,14 @@ if (! function_exists('get_filenames')) if ($_recursion === FALSE) { $_filedata = array(); - $source_dir = realpath($source_dir).'/'; + $source_dir = rtrim(realpath($source_dir), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR; } while (FALSE !== ($file = readdir($fp))) { if (@is_dir($source_dir.$file) && substr($file, 0, 1) != '.') { - get_filenames($source_dir.$file."/", $include_path, TRUE); + get_filenames($source_dir.$file.DIRECTORY_SEPARATOR, $include_path, TRUE); } elseif (substr($file, 0, 1) != ".") { diff --git a/user_guide/changelog.html b/user_guide/changelog.html index b6632305f..870e21c1d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -93,7 +93,7 @@ Change Log
  • Fixed an AR_caching error where it wasn't tracking table aliases (#3463).
  • Fixed a bug in the DB class testing the $params argument.
  • Fixed a bug in the Table library where the integer 0 in cell data would be displayed as a blank cell.
    • -
  • Fixed bugs (#3523, #4350) in get_filenames() with recursion.

    +
  • Fixed bugs (#3523, #4350) in get_filenames() with recursion and problems with Windows when $include_path is used.

    Version 1.6.1

    -- cgit v1.2.3-24-g4f1b