Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixing failing tests in SessionHelper caused by changes in CakeSessio…

…n. Removing SessionHelper::id() as all it did was call the parent method.
  • Loading branch information...
commit 17852ab3aa112ae2cac76d374c42585311b2e19e 1 parent 068631e
@markstory markstory authored
Showing with 5 additions and 13 deletions.
  1. +5 −13 cake/libs/view/helpers/session.php
View
18 cake/libs/view/helpers/session.php
@@ -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;
}
@@ -177,26 +179,16 @@ function write() {
}
/**
- * 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;
}
Please sign in to comment.
Something went wrong with that request. Please try again.