diff options
author | Ahmad Anbar <aanbar@gmail.com> | 2015-05-17 12:20:34 +0200 |
---|---|---|
committer | Ahmad Anbar <aanbar@gmail.com> | 2015-05-17 12:20:34 +0200 |
commit | 57940dedcaab05f2dc392b2757cb3d58c59274c9 (patch) | |
tree | 1783dc5a17cc20ddede409e13984576bff274302 /system/libraries/Ftp.php | |
parent | 5e50c42ef27261bc7fcb279499ce76cfc2519aa6 (diff) | |
parent | 3a9eb39f61b10b3f86e50f4cd39ca0d9f010bac2 (diff) |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/libraries/Ftp.php')
-rw-r--r-- | system/libraries/Ftp.php | 2 |
1 files changed, 1 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]); } } } |