Permalink
Browse files

Fix for Session Component to use CakeSession started() checks. Refs #332

.
  • Loading branch information...
1 parent 9740029 commit 9f5949ab5273048c76bf411d7c0057ba217d6132 @predominant predominant committed Mar 26, 2010
View
16 cake/libs/controller/components/session.php
@@ -44,13 +44,6 @@ class SessionComponent extends CakeSession {
*/
var $__active = true;
/**
- * Used to determine if Session has been started
- *
- * @var boolean
- * @access private
- */
- var $__started = false;
-/**
* Used to determine if request are from an Ajax request
*
* @var boolean
@@ -89,7 +82,7 @@ function initialize(&$controller) {
* @access public
*/
function startup(&$controller) {
- if ($this->__started === false && $this->__active === true) {
+ if ($this->started() === false && $this->__active === true) {
$this->__start();
}
}
@@ -299,15 +292,14 @@ function id($id = null) {
* @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();
}
}
View
4 cake/tests/cases/libs/controller/components/session.test.php
@@ -108,13 +108,13 @@ function testSessionAutoStart() {
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));

0 comments on commit 9f5949a

Please sign in to comment.