summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2009-02-10 22:59:20 +0100
committerDerek Jones <derek.jones@ellislab.com>2009-02-10 22:59:20 +0100
commit63dc27f30ed9327060e7e423a99b67a2f19b8f36 (patch)
tree59d70d34849973d610c44c777c5991a6d1551733
parent09a45be4b33751c1bd481f4301363db723b6881b (diff)
declared $_filedata as static so it can work properly with recursion through subdirectories
http://codeigniter.com/bug_tracker/bug/6592/
-rw-r--r--system/helpers/file_helper.php2
-rw-r--r--user_guide/changelog.html3
2 files changed, 3 insertions, 2 deletions
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index 8078d96fa..b0c554658 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -223,7 +223,7 @@ if ( ! function_exists('get_dir_file_info'))
{
function get_dir_file_info($source_dir, $include_path = FALSE, $_recursion = FALSE)
{
- $_filedata = array();
+ static $_filedata = array();
$relative_path = $source_dir;
if ($fp = @opendir($source_dir))
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index aa5f3cb92..60b90b973 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -136,6 +136,7 @@ SVN Revision: </p>
<li>Fixed a bug in the URL helper url_title() function where trailing periods were allowed at the end of a URL.</li>
<li>Fixed a bug (#6669) in the Email class when CRLF's are used for the newline character with headers when used with the "mail" protocol.</li>
<li>Fixed a bug (#6500) where URI::A_filter_uri() was exit()ing an error instead of using show_error().</li>
+ <li>Fixed a bug (#6592) in the File Helper where get_dir_file_info() where recursion was not occurring properly.</li>
<li>Tweaked Typography::auto_typography() for some edge-cases.</li>
</ul>
@@ -750,7 +751,7 @@ SVN Revision: 1155</p>
<li>Fixed a bug that affects some versions of PHP when output buffering is nested.</li>
<li>Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.</li>
<li>Fixed a pagination bug that was permitting negative values in the URL.</li>
-<li>Fixed an oversight in which the Loader class was not allowed to be exteneded.</li>
+<li>Fixed an oversight in which the Loader class was not allowed to be extended.</li>
<li>Changed <dfn>_get_config()</dfn> to <dfn>get_config()</dfn> since the function is not a private one.</li>
<li><strong>Deprecated "init" folder</strong>. Initialization happens automatically now. <a href="./general/creating_libraries.html">Please see documentation</a>.</li>
<li><strong>Deprecated</strong> $this->db->field_names() USE $this->db->list_fields()</li>