summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-01-01 16:59:47 +0100
committerDerek Allard <derek.allard@ellislab.com>2008-01-01 16:59:47 +0100
commita0fa90b1bbb61d47bcc9bc95d983e66dfc8732dd (patch)
treeb862a295adcd6a1ea1d6a116fcb9979bb233eeba
parent848b77685de0346da3f9fb8614e59f7d11552e61 (diff)
Fixed a bug in get_filenames() in the File Helper where the array wasn't cleared after each call.
-rw-r--r--system/helpers/file_helper.php2
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index 18798fdf4..d07d35f97 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -156,7 +156,7 @@ function delete_files($path, $del_dir = FALSE, $level = 0)
*/
function get_filenames($source_dir, $include_path = FALSE)
{
- static $_filedata = array();
+ $_filedata = array();
if ($fp = @opendir($source_dir))
{
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 3c234654c..b28ec8c46 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -100,6 +100,7 @@ Change Log
<li>Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.</li>
<li>Fixed a bug that was making validation callbacks required even when not set as such.</li>
<li>Fixed a bug in _object_to_array that broke some types of inserts and updates.</li>
+ <li>Fixed a bug in <kbd>get_filenames()</kbd> in the <a href="./helpers/file_helper.html">File Helper </a>where the array wasn't cleared after each call.</li>
<li>Fixed an example of comma-separated emails in the email library documentation.</li>
<li>Fixed an example in the Calendar library for Showing Next/Previous Month Links.</li>
<li>Fixed a typo in the database language file.</li>