Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3

cake/libs/cake_session.php

@@ -114,6 +114,13 @@ class CakeSession extends Object {
  */
 	var $id = null;
 
+/**
+ * Session Started
+ *
+ * @var boolean
+ * @access protected
+ */
+	var $_started = false;
 /**
  * Constructor.
  *
@@ -181,16 +188,19 @@ class CakeSession extends Object {
 /**
  * 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();
 	}
 
 /**
@@ -200,7 +210,7 @@ class CakeSession extends Object {
  * @return boolean True if session has been started.
  */
 	function started() {
-		if (isset($_SESSION)) {
+		if (isset($_SESSION) && $this->_started) {
 			return true;
 		}
 		return false;
@@ -233,7 +243,7 @@ class CakeSession extends Object {
 			$this->id = $id;
 			session_id($this->id);
 		}
-		if (isset($_SESSION)) {
+		if ($this->started()) {
 			return session_id();
 		} else {
 			return $this->id;

cake/libs/controller/components/session.php

@@ -41,12 +41,12 @@ class SessionComponent extends CakeSession {
 	var $__active = true;
 
 /**
- * Used to determine if Session has been started
+ * Used to determine if request are from an Ajax request
  *
  * @var boolean
  * @access private
  */
-	var $__started = false;
+	var $__bare = 0;
 
 /**
  * Class constructor
@@ -69,7 +69,7 @@ class SessionComponent extends CakeSession {
  * @access public
  */
 	function startup(&$controller) {
-		if ($this->__started === false && $this->__active === true) {
+		if ($this->started() === false && $this->__active === true) {
 			$this->__start();
 		}
 	}
@@ -275,15 +275,14 @@ class SessionComponent extends CakeSession {
  * @access private
  */
 	function __start() {
-		if ($this->__started === false) {
+		if ($this->started() === false) {
 			if (!$this->id() && parent::start()) {
-				$this->__started = true;
 				parent::_checkValid();
 			} else {
-				$this->__started = parent::start();
+				parent::start();
 			}
 		}
-		return $this->__started;
+		return $this->started();
 	}
 }
 

cake/tests/cases/libs/controller/components/session.test.php

@@ -112,13 +112,13 @@ class SessionComponentTest extends CakeTestCase {
 		Configure::write('Session.start', false);
 		$Session =& new SessionComponent();
 		$this->assertFalse($Session->__active);
-		$this->assertFalse($Session->__started);
+		$this->assertFalse($Session->started());
 		$Session->startup(new SessionTestController());
 
 		Configure::write('Session.start', true);
 		$Session =& new SessionComponent();
 		$this->assertTrue($Session->__active);
-		$this->assertFalse($Session->__started);
+		$this->assertFalse($Session->started());
 		$Session->startup(new SessionTestController());
 		$this->assertTrue(isset($_SESSION));