Merging fixes and enhancements into trunk Added fix for Ticket #492.

Revision: [2301]
"Moving the check for cached pages after the models are loaded.
Some issues where found when using acl components"


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2302 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-03-14 13:58:29 +00:00
parent 9f9c84de52
commit 856065056c
2 changed files with 10 additions and 10 deletions

View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ //
///////////////////////////////////////////////////////////////////////////////////////////////////////////
1.0.0.2300
1.0.0.2302

View file

@ -109,6 +109,15 @@ else
$TIME_START = getMicrotime();
require CAKE.'dispatcher.php';
require LIBS.'model'.DS.'connection_manager.php';
config('database');
if (!class_exists('AppModel'))
{
require LIBS.'model'.DS.'model.php';
loadModels();
}
if(defined('CACHE_CHECK') && CACHE_CHECK === true)
{
if (empty($uri))
@ -131,13 +140,4 @@ if(defined('CACHE_CHECK') && CACHE_CHECK === true)
$view->renderCache(CACHE.'views'.DS.convertSlash($uri).'_index.php', $TIME_START);
}
}
require LIBS.'model'.DS.'connection_manager.php';
config('database');
if (!class_exists('AppModel'))
{
require LIBS.'model'.DS.'model.php';
loadModels();
}
?>