mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 11:28:25 +00:00
fixing Configure where Set is not found.also adding to CakeSession
This commit is contained in:
parent
766e12bc2a
commit
cfb46024d7
2 changed files with 4 additions and 2 deletions
|
@ -128,7 +128,7 @@ class CakeSession extends Object {
|
||||||
* @access public
|
* @access public
|
||||||
*/
|
*/
|
||||||
function __construct($base = null, $start = true) {
|
function __construct($base = null, $start = true) {
|
||||||
App::import('Core', 'Security');
|
App::import('Core', 'Set', 'Security');
|
||||||
$this->time = time();
|
$this->time = time();
|
||||||
|
|
||||||
if (Configure::read('Session.checkAgent') === true || Configure::read('Session.checkAgent') === null) {
|
if (Configure::read('Session.checkAgent') === true || Configure::read('Session.checkAgent') === null) {
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
* @lastmodified $Date$
|
* @lastmodified $Date$
|
||||||
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
|
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configuration class (singleton). Used for managing runtime configuration information.
|
* Configuration class (singleton). Used for managing runtime configuration information.
|
||||||
*
|
*
|
||||||
|
@ -61,6 +60,9 @@ class Configure extends Object {
|
||||||
function &getInstance($boot = true) {
|
function &getInstance($boot = true) {
|
||||||
static $instance = array();
|
static $instance = array();
|
||||||
if (!$instance) {
|
if (!$instance) {
|
||||||
|
if (!class_exists('Set')) {
|
||||||
|
require LIBS . 'set.php';
|
||||||
|
}
|
||||||
$instance[0] =& new Configure();
|
$instance[0] =& new Configure();
|
||||||
$instance[0]->__loadBootstrap($boot);
|
$instance[0]->__loadBootstrap($boot);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue