diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-04 18:15:17 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-04 18:15:17 +0200 |
| commit | c2bb1073e476a3928913b384cd5f7bcad6c21b5b (patch) | |
| tree | a73b3459f0f34558a7d9c8fc83026b39388731fb | |
| parent | 407fcc9878f795d18b827cbdfa9a3f8d5c0fa822 (diff) | |
| parent | 79eca3d6e5e3aec576410e3c533164d29196b0eb (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
| -rw-r--r-- | system/libraries/Encrypt.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index 102b1dfdd..959e2eea8 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -449,7 +449,7 @@ class CI_Encrypt { */ protected function _get_cipher() { - if ($this->_mcrypt_cipher === '') + if ($this->_mcrypt_cipher === NULL) { return $this->_mcrypt_cipher = MCRYPT_RIJNDAEL_256; } @@ -466,7 +466,7 @@ class CI_Encrypt { */ protected function _get_mode() { - if ($this->_mcrypt_mode === '') + if ($this->_mcrypt_mode === NULL) { return $this->_mcrypt_mode = MCRYPT_MODE_CBC; } |