diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-04-20 13:47:00 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-04-20 13:47:00 +0200 |
| commit | d3913f591353d17954ee900f2524f24c1833af85 (patch) | |
| tree | d6de95c29951251436875d9ce53bd04321eb75a8 | |
| parent | 6b620fb7e61f1051f5bced189d1b57bd30a97126 (diff) | |
Fix #3787
| -rw-r--r-- | system/libraries/Ftp.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index af45bb55f..b53207577 100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php @@ -490,7 +490,7 @@ class CI_FTP { // so we'll recursively call delete_dir() if ( ! preg_match('#/\.\.?$#', $list[$i]) && ! @ftp_delete($this->conn_id, $list[$i])) { - $this->delete_dir($list[$i]); + $this->delete_dir($filepath.$list[$i]); } } } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 5454638ac..ae8dde6f9 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -19,6 +19,7 @@ Bug fixes for 3.0.1 - Fixed a bug (#3761) - :doc:`URL Helper <helpers/url_helper>` function :php:func:`anchor()` didn't work with array inputs. - Fixed a bug (#3773) - ``db_select()`` didn't work for MySQL with the PDO :doc:`Database <database/index>` driver. - Fixed a bug (#3771) - :doc:`Form Validation Library <libraries/form_validation>` was looking for a 'form_validation_' prefix when trying to translate field name labels. +- Fixed a bug (#3787) - :doc:`FTP Library <libraries/ftp>` method ``delete_dir()`` failed when the target has subdirectories. Version 3.0.0 ============= |