summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-11 10:45:10 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-11 10:45:10 +0200
commit782520a60648f40dd10e26f7d073c3670c65c935 (patch)
treeb21bda0881b1d8abb88faec8ea74b3673c7aa618
parenta52c775d490fede2a0cb7f54f0dcc5010d7e0465 (diff)
parentc16b4f4164a4a26c48b823caf086a9777dc75beb (diff)
Merge pull request #1873 from lysenkobv/patch-1
libraries/Encrypt.php decode improvement
-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 679609251..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))
+ if (preg_match('/[^a-zA-Z0-9\/\+=]/', $string) OR base64_encode(base64_decode($string)) !== $string)
{
return FALSE;
}