Merge tag '2.1.3'

Conflicts:
	user_guide

Signed-off-by: Florian Pritz <bluewind@xinu.at>

1 files changed, 5 insertions, 2 deletions

diff --git a/system/libraries/Session.php b/system/libraries/Session.php
index 8ee08c5b2..891fdd36a 100755
--- a/system/libraries/Session.php
+++ b/system/libraries/Session.php
@@ -97,7 +97,7 @@ class CI_Session {
 		{
 			$this->sess_expiration = (60*60*24*365*2);
 		}
-		
+
 		// Set the cookie name
 		$this->sess_cookie_name = $this->cookie_prefix.$this->sess_cookie_name;
 
@@ -399,7 +399,7 @@ class CI_Session {
 	function sess_destroy()
 	{
 		// Kill the session DB row
-		if ($this->sess_use_database === TRUE AND isset($this->userdata['session_id']))
+		if ($this->sess_use_database === TRUE && isset($this->userdata['session_id']))
 		{
 			$this->CI->db->where('session_id', $this->userdata['session_id']);
 			$this->CI->db->delete($this->sess_table_name);
@@ -414,6 +414,9 @@ class CI_Session {
 					$this->cookie_domain,
 					0
 				);
+
+		// Kill session data
+		$this->userdata = array();
 	}
 
 	// --------------------------------------------------------------------