diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-27 10:44:54 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-27 10:44:54 +0200 |
| commit | 70f94006326196e4c5b79843c0f8e91984caa593 (patch) | |
| tree | 9b5502f4ec3b0b8022d8cd2d8cad3b9964736244 | |
| parent | 2a3f51286a872ec563b191da5b8fbb7cbd392191 (diff) | |
| parent | 625c43a2f451191d0195f6311dd3a7ea94439988 (diff) | |
Merge pull request #1540 from vlakoff/develop
FTP Class documentation cleanup
| -rw-r--r-- | system/libraries/Ftp.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/ftp.rst | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php index 461e884fb..76f5e151a 100644 --- a/system/libraries/Ftp.php +++ b/system/libraries/Ftp.php @@ -445,7 +445,7 @@ class CI_FTP { * Set file permissions * * @param string the file path - * @param string the permissions + * @param int the permissions * @return bool */ public function chmod($path, $perm) diff --git a/user_guide_src/source/libraries/ftp.rst b/user_guide_src/source/libraries/ftp.rst index 20b11a5c8..05a3fdcc8 100644 --- a/user_guide_src/source/libraries/ftp.rst +++ b/user_guide_src/source/libraries/ftp.rst @@ -26,7 +26,7 @@ Usage Examples In this example a connection is opened to the FTP server, and a local file is read and uploaded in ASCII mode. The file permissions are set to -755. Note: Setting permissions requires PHP 5. +755. :: @@ -136,8 +136,7 @@ Example:: **Mode options are:** ascii, binary, and auto (the default). If auto is used it will base the mode on the file extension of the source file. -Permissions are available if you are running PHP 5 and can be passed as -an octal value in the fourth parameter. +If set, permissions have to be passed as an octal value. $this->ftp->download() ====================== |