adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing failing tests in SessionHelper caused by changes in CakeSession. Removing SessionHelper::id() as all it did was call the parent method.

Browse source
This commit is contained in:
Mark Story 2010-03-28 17:41:58 -04:00
parent 068631ebe2
commit 17852ab3aa
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cake/libs/view/helpers/session.php
View file

@ -52,6 +52,8 @@ class SessionHelper extends CakeSession {
function __construct($base = null) {
if (Configure::read('Session.start') === true) {
parent::__construct($base, false);
$this->start();
$this->__active = true;
} else {
$this->__active = false;
}
@ -176,27 +178,17 @@ class SessionHelper extends CakeSession {
trigger_error(__('You can not write to a Session from the view', true), E_USER_WARNING);
}
/**
* Session id
*
* @return string Session id
* @access public
*/
function id() {
return parent::id();
}
/**
* Determine if Session has been started
* and attempt to start it if not
*
* @return boolean true if Session is already started, false if
* Session could not be started
* @access public
* @access private
*/
function __start() {
if (!parent::started()) {
parent::start();
if (!$this->started()) {
return $this->start();
}
return true;
}