diff options
| author | Jonatas Miguel <jonatas.df.miguel@gmail.com> | 2012-10-24 19:30:36 +0200 |
|---|---|---|
| committer | Jonatas Miguel <jonatas.df.miguel@gmail.com> | 2012-10-24 19:30:36 +0200 |
| commit | b51823dde5fbae508b8ebf99258d2f514a8bece8 (patch) | |
| tree | 4db09a22f85e0ddf151c940cd3e6fbaa799b8513 /system/libraries/Ftp.php | |
| parent | a53f402b78ad07fb0f6da19cff0c7bec3a09a4c0 (diff) | |
| parent | a7001e968a4791312391eb245ad84888893cda8f (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Conflicts:
user_guide_src/source/changelog.rst
Diffstat (limited to 'system/libraries/Ftp.php')
| -rw-r--r-- | system/libraries/Ftp.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index 76f5e151a..ae85fdf37 100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php @@ -44,6 +44,12 @@ class CI_FTP { public $debug = FALSE; public $conn_id = FALSE; + /** + * Constructor + * + * @param array $config = array() + * @return void + */ public function __construct($config = array()) { if (count($config) > 0) @@ -474,6 +480,7 @@ class CI_FTP { /** * FTP List files in the specified directory * + * @param string $path = '.' * @return array */ public function list_files($path = '.') |