mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
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:
parent
9f9c84de52
commit
856065056c
2 changed files with 10 additions and 10 deletions
|
@ -6,4 +6,4 @@
|
|||
// +---------------------------------------------------------------------------------------------------+ //
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
1.0.0.2300
|
||||
1.0.0.2302
|
|
@ -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();
|
||||
}
|
||||
?>
|
Loading…
Reference in a new issue