summaryrefslogtreecommitdiffstats
path: root/system/libraries/Session.php
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2010-08-31 16:42:43 +0200
committerDerek Jones <derek.jones@ellislab.com>2010-08-31 16:42:43 +0200
commitb1e973247b66e0f4dc576484add50c2ebe10125a (patch)
tree9c80207be0914599ee04dc0db80d4c957c1192c2 /system/libraries/Session.php
parent95b183addfb1683583d401e04f2684ceb86f8b96 (diff)
parent7284f06585a689702ea86684893c999065621460 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'system/libraries/Session.php')
-rw-r--r--system/libraries/Session.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/system/libraries/Session.php b/system/libraries/Session.php
index cf6dc96e3..f413c0d1b 100644
--- a/system/libraries/Session.php
+++ b/system/libraries/Session.php
@@ -65,6 +65,11 @@ class CI_Session {
$this->$key = (isset($params[$key])) ? $params[$key] : $this->CI->config->item($key);
}
+ if ($this->encryption_key == '')
+ {
+ show_error('In order to use the Session class you are required to set an encryption key in your config file.');
+ }
+
// Load the string helper so we can use the strip_slashes() function
$this->CI->load->helper('string');