From 4dc06183aa67ba1911562719c97f41c6a9529075 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 7 May 2008 22:45:21 +0000 Subject: Fixed bug with recursive deletes in delete_dir() http://codeigniter.com/bug_tracker/bug/4215/ --- system/libraries/Ftp.php | 6 +++--- user_guide/changelog.html | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index 1b5ec2fd2..74b7728fa 100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php @@ -379,15 +379,15 @@ class CI_FTP { $list = $this->list_files($filepath); - if ($list !== FALSE AND count($list) > 0) + if ($list !== FALSE) { foreach ($list as $item) { // If we can't delete the item it's probaly a folder so // we'll recursively call delete_dir() - if (! @ftp_delete($this->conn_id, $filepath.$item)) + if (! @ftp_delete($this->conn_id, $item)) { - $this->delete_dir($filepath.$item); + $this->delete_dir($item); } } } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 351e1e85e..ea14a3961 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -115,6 +115,7 @@ SVN Commit: not currently released

  • Fixed an incorrect documentation of $this->load->language (#3520).
  • Fixed an AR_caching error where it wasn't tracking table aliases (#3463).
  • Fixed an AR bug with or_where_not_in() (#4171).
    • +
  • Fixed a bug in the FTP library where delete_dir() was not working recursively (#4215).
  • Fixed an AR bug when joining with a table alias and table prefix (#4400).
  • Fixed a bug in DB Forge, when inserting an id field (#3456).
  • Fixed a bug in the DB class testing the $params argument.
    • -- cgit v1.2.3-24-g4f1b