summaryrefslogtreecommitdiffstats
path: root/system/libraries/Encryption.php
diff options
context:
space:
mode:
authorAhmad Anbar <aanbar@gmail.com>2015-02-08 17:29:52 +0100
committerAhmad Anbar <aanbar@gmail.com>2015-02-08 17:29:52 +0100
commited520408514fff6486788e1543589418d24d885e (patch)
tree07fd3194e9c6baf7aeaa9ccdd164e3fec4494922 /system/libraries/Encryption.php
parente5454f9b28f123a5549971f580255a065b2f8cc2 (diff)
parent266c93cc505ae9a8cafb41f9d9432b056de492e0 (diff)
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/libraries/Encryption.php')
-rw-r--r--system/libraries/Encryption.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Encryption.php b/system/libraries/Encryption.php
index fad4ea7f8..e3e68139a 100644
--- a/system/libraries/Encryption.php
+++ b/system/libraries/Encryption.php
@@ -160,7 +160,7 @@ class CI_Encryption {
if ( ! $this->_drivers['mcrypt'] && ! $this->_drivers['openssl'])
{
- return show_error('Encryption: Unable to find an available encryption driver.');
+ show_error('Encryption: Unable to find an available encryption driver.');
}
isset(self::$func_override) OR self::$func_override = (extension_loaded('mbstring') && ini_get('mbstring.func_override'));