From 63dc27f30ed9327060e7e423a99b67a2f19b8f36 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Tue, 10 Feb 2009 21:59:20 +0000 Subject: declared $_filedata as static so it can work properly with recursion through subdirectories http://codeigniter.com/bug_tracker/bug/6592/ --- system/helpers/file_helper.php | 2 +- user_guide/changelog.html | 3 ++- 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:

  • Fixed a bug in the URL helper url_title() function where trailing periods were allowed at the end of a URL.
  • 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.
  • Fixed a bug (#6500) where URI::A_filter_uri() was exit()ing an error instead of using show_error().
    • +
  • Fixed a bug (#6592) in the File Helper where get_dir_file_info() where recursion was not occurring properly.
  • Tweaked Typography::auto_typography() for some edge-cases.
    • @@ -750,7 +751,7 @@ SVN Revision: 1155

  • Fixed a bug that affects some versions of PHP when output buffering is nested.
  • Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.
  • Fixed a pagination bug that was permitting negative values in the URL.
    • -
  • Fixed an oversight in which the Loader class was not allowed to be exteneded.
    • +
  • Fixed an oversight in which the Loader class was not allowed to be extended.
  • Changed _get_config() to get_config() since the function is not a private one.
  • Deprecated "init" folder. Initialization happens automatically now. Please see documentation.
  • Deprecated $this->db->field_names() USE $this->db->list_fields()
    • -- cgit v1.2.3-24-g4f1b