summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-01-10 21:31:29 +0100
committerAndrey Andreev <narf@bofh.bg>2012-01-10 21:31:29 +0100
commitd655a997f7b98da29ea932084e2fb50956188141 (patch)
tree35ac6a1d3333dfb719e508483b53db7bbd9dcd2b /system/libraries
parentcc6dbda62c1c04d4e247308f980e64d5d13c932d (diff)
Two returns
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Encrypt.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php
index 63e3bb55e..8cb4b1b19 100644
--- a/system/libraries/Encrypt.php
+++ b/system/libraries/Encrypt.php
@@ -180,7 +180,6 @@ class CI_Encrypt {
$key = $this->get_key($key);
$dec = base64_decode($string);
-
if (($dec = $this->mcrypt_decode($dec, $key)) === FALSE)
{
return FALSE;
@@ -419,7 +418,7 @@ class CI_Encrypt {
{
if ($this->_mcrypt_cipher == '')
{
- $this->_mcrypt_cipher = MCRYPT_RIJNDAEL_256;
+ return $this->_mcrypt_cipher = MCRYPT_RIJNDAEL_256;
}
return $this->_mcrypt_cipher;
@@ -436,7 +435,7 @@ class CI_Encrypt {
{
if ($this->_mcrypt_mode == '')
{
- $this->_mcrypt_mode = MCRYPT_MODE_CBC;
+ return $this->_mcrypt_mode = MCRYPT_MODE_CBC;
}
return $this->_mcrypt_mode;