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

This commit is contained in:
gwoo 2009-07-25 12:32:02 -07:00
parent 766e12bc2a
commit cfb46024d7
2 changed files with 4 additions and 2 deletions

View file

@ -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) {

View file

@ -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);
}