diff options
| author | dchill42 <dchill42@gmail.com> | 2012-10-12 22:26:12 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-10-12 22:26:12 +0200 |
| commit | 93ec20b8d9afbf8cb22ec6383b7fb24fe70330e8 (patch) | |
| tree | 8ad006bb39a8caee805fb9dd35912b32fc2d9778 /system/libraries/Encrypt.php | |
| parent | 7ecc5cda6647a4b316b44dc40d5925d9ef63c908 (diff) | |
| parent | 98ebf4351f8aad58504cd7318ddd94faf0dec482 (diff) | |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into load_config_units
Diffstat (limited to 'system/libraries/Encrypt.php')
| -rw-r--r-- | system/libraries/Encrypt.php | 2 |
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; } |