summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorBogdan Lysenko <lysenkobv@gmail.com>2012-10-11 10:41:01 +0200
committerBogdan Lysenko <lysenkobv@gmail.com>2012-10-11 10:41:01 +0200
commitc16b4f4164a4a26c48b823caf086a9777dc75beb (patch)
tree389135eb9998f0cd1cad039d97eff97a8aa968e9 /system
parentc6f9a5da098ed9e27d88b7c271c4e1ba76fa79d6 (diff)
Update system/libraries/Encrypt.php
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Encrypt.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php
index dbe16b096..73ab8ca7d 100644
--- a/system/libraries/Encrypt.php
+++ b/system/libraries/Encrypt.php
@@ -165,7 +165,7 @@ class CI_Encrypt {
*/
public function decode($string, $key = '')
{
- if (preg_match('/[^a-zA-Z0-9\/\+=]/', $string) || base64_encode(base64_decode($string)) !== $string)
+ if (preg_match('/[^a-zA-Z0-9\/\+=]/', $string) OR base64_encode(base64_decode($string)) !== $string)
{
return FALSE;
}