adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 20:46:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
predominant 2010-03-26 14:29:27 +11:00
parent 13a55b6cd8
commit 5d3f0d7fe0
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cake/libs/controller/components/session.php
View file

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

4
cake/tests/cases/libs/controller/components/session.test.php
View file

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