diff options
| author | brian978 <dbrian89@yahoo.com> | 2012-12-18 12:23:14 +0100 |
|---|---|---|
| committer | brian978 <dbrian89@yahoo.com> | 2012-12-18 12:23:14 +0100 |
| commit | 0fb101849e53593fdceb7064f32ea5176e6eed16 (patch) | |
| tree | e33629f2352da2715d559364af955d6dda59d203 /system/libraries/Encrypt.php | |
| parent | 07ccbe59cf9d78d944551f810a14064e979840a3 (diff) | |
| parent | d8dba5d3ecbe1ff4502b04a9cf3086908db140d1 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/libraries/Encrypt.php')
| -rw-r--r-- | system/libraries/Encrypt.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index cdb0a6452..e54ce4950 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -122,7 +122,7 @@ class CI_Encrypt { * Set the encryption key * * @param string - * @return object + * @return CI_Encrypt */ public function set_key($key = '') { @@ -419,7 +419,7 @@ class CI_Encrypt { * Set the Mcrypt Cipher * * @param int - * @return object + * @return CI_Encrypt */ public function set_cipher($cipher) { @@ -433,7 +433,7 @@ class CI_Encrypt { * Set the Mcrypt Mode * * @param int - * @return object + * @return CI_Encrypt */ public function set_mode($mode) { |