Skip to content
Permalink
Browse files

fixing Configure where Set is not found.also adding to CakeSession

  • Loading branch information...
gwoo
gwoo committed Jul 25, 2009
1 parent 766e12b commit cfb46024d76b7e22086a6b08a9ba8e0e8f348908
Showing with 4 additions and 2 deletions.
  1. +1 −1 cake/libs/cake_session.php
  2. +3 −1 cake/libs/configure.php
@@ -128,7 +128,7 @@ class CakeSession extends Object {
* @access public
*/
function __construct($base = null, $start = true) {
App::import('Core', 'Security');
App::import('Core', 'Set', 'Security');
$this->time = time();
if (Configure::read('Session.checkAgent') === true || Configure::read('Session.checkAgent') === null) {
@@ -25,7 +25,6 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Configuration class (singleton). Used for managing runtime configuration information.
*
@@ -61,6 +60,9 @@ class Configure extends Object {
function &getInstance($boot = true) {
static $instance = array();
if (!$instance) {
if (!class_exists('Set')) {
require LIBS . 'set.php';
}
$instance[0] =& new Configure();
$instance[0]->__loadBootstrap($boot);
}

0 comments on commit cfb4602

Please sign in to comment.
You can’t perform that action at this time.