diff --git a/cake/libs/controller/components/session.php b/cake/libs/controller/components/session.php index 4dc6e8978..fbe572009 100644 --- a/cake/libs/controller/components/session.php +++ b/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(); } } diff --git a/cake/tests/cases/libs/controller/components/session.test.php b/cake/tests/cases/libs/controller/components/session.test.php index 575aa3020..5eb2e39bc 100644 --- a/cake/tests/cases/libs/controller/components/session.test.php +++ b/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));