From 88b636b06dd91807706e2d442d910fe8b6a3b50c Mon Sep 17 00:00:00 2001
From: dchill42 <dchill42@gmail.com>
Date: Wed, 29 Aug 2012 08:47:05 -0400
Subject: Fixed defaults and database check, reverted redundant shutdown
 feature

Signed-off-by: dchill42 <dchill42@gmail.com>
---
 system/libraries/Session/Session.php               | 35 ----------------------
 .../libraries/Session/drivers/Session_cookie.php   | 21 ++++---------
 2 files changed, 5 insertions(+), 51 deletions(-)

(limited to 'system/libraries/Session')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 1195ed955..1f24456a4 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -42,7 +42,6 @@ class CI_Session extends CI_Driver_Library {
 	public $params = array();
 	protected $current = null;
 	protected $userdata = array();
-	protected $loaded = array();
 
 	const FLASHDATA_KEY = 'flash';
 	const FLASHDATA_NEW = ':new:';
@@ -112,22 +111,6 @@ class CI_Session extends CI_Driver_Library {
 		log_message('debug', 'CI_Session routines successfully run');
 	}
 
-	/**
-	 * CI_Session destructor
-	 *
-	 * The destructor calls shutdown() on each loaded driver
-	 */
-	public function __destruct()
-	{
-		// Call shutdown for each loaded driver
-		foreach ($this->loaded as $driver)
-		{
-			$this->$driver->shutdown();
-		}
-
-		log_message('debug', 'CI_Session Class Shutdown');
-	}
-
 	/**
 	 * Loads session storage driver
 	 *
@@ -139,14 +122,6 @@ class CI_Session extends CI_Driver_Library {
 		// Save reference to most recently loaded driver as library default and sync userdata
 		$this->current = parent::load_driver($driver);
 		$this->userdata =& $this->current->get_userdata();
-
-		// Mark driver as loaded
-		if (!in_array($driver, $this->loaded))
-		{
-			$this->loaded[] = $driver;
-		}
-
-		// Return driver object
 		return $this->current;
 	}
 
@@ -606,16 +581,6 @@ abstract class CI_Session_driver extends CI_Driver {
 		// Overload this method to implement initialization
 	}
 
-	/**
-	 * Shut down driver
-	 *
-	 * @return	void
-	 */
-	public function shutdown()
-	{
-		// Overload this method to implement shutdown
-	}
-
 	/**
 	 * Save the session data
 	 *
diff --git a/system/libraries/Session/drivers/Session_cookie.php b/system/libraries/Session/drivers/Session_cookie.php
index df3282cee..69e5fde14 100755
--- a/system/libraries/Session/drivers/Session_cookie.php
+++ b/system/libraries/Session/drivers/Session_cookie.php
@@ -176,10 +176,10 @@ class CI_Session_cookie extends CI_Session_driver {
 	 * @var	array
 	 */
 	protected $defaults = array(
-		'session_id',
-		'ip_address',
-		'user_agent',
-		'last_activity'
+		'session_id' => NULL,
+		'ip_address' => NULL,
+		'user_agent' => NULL,
+		'last_activity' => NULL
 	);
 
 	/**
@@ -280,17 +280,6 @@ class CI_Session_cookie extends CI_Session_driver {
 		$this->_sess_gc();
 	}
 
-	/**
-	 * Shutdown session driver object
-	 *
-	 * @return	void
-	 */
-	public function shutdown()
-	{
-		// Just update the DB
-		$this->_update_db();
-	}
-
 	/**
 	 * Write the session data
 	 *
@@ -299,7 +288,7 @@ class CI_Session_cookie extends CI_Session_driver {
 	public function sess_save()
 	{
 		// Check for database
-		if ($this->sess_use_database === FALSE)
+		if ($this->sess_use_database === TRUE)
 		{
 			// Mark custom data as dirty so we know to update the DB
 			$this->data_dirty = TRUE;
-- 
cgit v1.2.3-24-g4f1b