summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-11-07 15:57:41 +0100
committerAndrey Andreev <narf@devilix.net>2014-11-07 15:57:41 +0100
commit50c9ea154c125f5ce1a2d0384470f4e71188d628 (patch)
tree6b3f8ebfe2e44cef0d591513fe4175e0af726bfd /system/libraries
parentd8e31ec82d4f25378d6032df81fc5e9af5de5738 (diff)
Fix #3317 ... MCrypt sucks
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Encryption.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/system/libraries/Encryption.php b/system/libraries/Encryption.php
index fe8434c46..2a28714f5 100644
--- a/system/libraries/Encryption.php
+++ b/system/libraries/Encryption.php
@@ -212,6 +212,7 @@ class CI_Encryption {
log_message('debug', "Encryption: Auto-configured driver '".$this->_driver."'.");
}
+ empty($params['cipher']) && $params['cipher'] = $this->_cipher;
empty($params['key']) OR $this->_key = $params['key'];
$this->{'_'.$this->_driver.'_initialize'}($params);
return $this;