From e2caa77d0afa700adf9bfa029c453ea59f1e368d Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 8 Jan 2022 21:48:42 +0200 Subject: Fix #92 --- system/helpers/file_helper.php | 5 +++-- tests/mocks/database/ci_test.sqlite | Bin 19456 -> 19456 bytes user_guide_src/source/changelog.rst | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 398d11afd..c3b35d96d 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -227,8 +227,9 @@ if ( ! function_exists('get_dir_file_info')) } elseif ($file[0] !== '.') { - $_filedata[$file] = get_file_info($source_dir.$file); - $_filedata[$file]['relative_path'] = $relative_path; + $filedata = get_dir_file_info($source_dir.$file); + $filedata['relative_path'] = $relative_path; + $_filedata[] = $filedata; } } diff --git a/tests/mocks/database/ci_test.sqlite b/tests/mocks/database/ci_test.sqlite index 502913725..71306e2f0 100755 Binary files a/tests/mocks/database/ci_test.sqlite and b/tests/mocks/database/ci_test.sqlite differ diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 5d98e7554..cfe0ceba7 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -147,6 +147,7 @@ Bug fixes for 3.2.0 =================== - Fixed a bug (#5562) - :doc:`Cache Library ` 'redis' driver would pointlessly attempt to perform its functions if a connection to the Redis server failed. +- Fixed a bug (#92) - :doc:`File Helper ` function :php:func:`get_dir_file_info()` output could have colliding array keys. Version 3.1.12 ============== -- cgit v1.2.3-24-g4f1b