Refs #332. Beginning fix for multiple session starts.

cakephp · Mar 25, 2010 · d95e482 · d95e482
1 parent 4f4d3f9
commit d95e482
Showing 1 changed file with 27 additions and 15 deletions.
diff --git a/cake/libs/session.php b/cake/libs/session.php
@@ -116,6 +116,13 @@ class CakeSession extends Object {
  * @access public
  */
 	var $id = null;
+/**
+ * Session Started
+ *
+ * @var boolean
+ * @access public
+ */
+	var $started = false;
 /**
  * Constructor.
  *
@@ -163,16 +170,19 @@ function __construct($base = null, $start = true) {
 /**
  * Starts the Session.
  *
- * @param string $name Variable name to check for
+ * @return boolean True if session was started
- * @return boolean True if variable is there
  * @access public
  */
 	function start() {
+		if ($this->started) {
+			return true;
+		}
 		if (function_exists('session_write_close')) {
 			session_write_close();
 		}
 		$this->__initSession();
-		return $this->__startSession();
+		$this->started = $this->__startSession();
+		return $this->started;
 	}
 /**
  * Determine if Session has been started.
@@ -475,12 +485,13 @@ function __initSession() {
 						ini_set('session.auto_start', 0);
 					}
 				}
-				session_set_save_handler(array('CakeSession','__open'),
+				session_set_save_handler(
-													array('CakeSession', '__close'),
+					array('CakeSession','__open'),
-													array('CakeSession', '__read'),
+					array('CakeSession', '__close'),
-													array('CakeSession', '__write'),
+					array('CakeSession', '__read'),
-													array('CakeSession', '__destroy'),
+					array('CakeSession', '__write'),
-													array('CakeSession', '__gc'));
+					array('CakeSession', '__destroy'),
+					array('CakeSession', '__gc'));
 			break;
 			case 'php':
 				if (empty($_SESSION)) {
@@ -507,12 +518,13 @@ function __initSession() {
 						ini_set('session.cookie_path', $this->path);
 					}
 				}
-				session_set_save_handler(array('CakeSession','__open'),
+				session_set_save_handler(
-													array('CakeSession', '__close'),
+					array('CakeSession','__open'),
-													array('Cache', 'read'),
+					array('CakeSession', '__close'),
-													array('Cache', 'write'),
+					array('Cache', 'read'),
-													array('Cache', 'delete'),
+					array('Cache', 'write'),
-													array('Cache', 'gc'));
+					array('Cache', 'delete'),
+					array('Cache', 'gc'));
 			break;
 			default:
 				if (empty($_SESSION)) {