adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION.txt
View file

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

18
cake/bootstrap.php
View file

@ -109,6 +109,15 @@ else
$TIME_START = getMicrotime(); $TIME_START = getMicrotime();
require CAKE.'dispatcher.php'; 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(defined('CACHE_CHECK') && CACHE_CHECK === true)
{ {
if (empty($uri)) 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); $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();
}
?> ?>