summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2010-08-31 07:30:21 +0200
committerDerek Jones <derek.jones@ellislab.com>2010-08-31 07:30:21 +0200
commit7284f06585a689702ea86684893c999065621460 (patch)
treeade674a43557d452e9f3c1fd612dd65f20479fd3
parentac01acc5d786226f6372c2dc2bab81c7d8f3bd06 (diff)
changed key comparison to be loosely typed, so an error would be triggered when an empty string is attempted to be used as an encryption key
-rw-r--r--system/libraries/Encrypt.php2
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php
index c893fbf9e..44fdce03b 100644
--- a/system/libraries/Encrypt.php
+++ b/system/libraries/Encrypt.php
@@ -72,7 +72,7 @@ class CI_Encrypt {
$CI =& get_instance();
$key = $CI->config->item('encryption_key');
- if ($key === FALSE)
+ if ($key == FALSE)
{
show_error('In order to use the encryption class requires that you set an encryption key in your config file.');
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 18e4df7ad..d9c17ab76 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -177,6 +177,7 @@ Hg Tag: </p>
<li>Fixed a bug where extending the Controller class would result in a fatal PHP error.</li>
<li>Fixed a PHP Strict Standards Error in the index.php file.</li>
<li>Fixed a bug where getimagesize() was being needlessly checked on non-image files in is_allowed_type().</li>
+ <li>Fixed a bug in the Encryption library where an empty key was not triggering an error.</li>
</ul>
<h2>Version 1.7.2</h2>