adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing issues caused by merge with 1.2.

Browse source
This commit is contained in:
mark_story 2009-11-09 14:07:19 -05:00
parent c4b493c934
commit fa1b7f617f
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cake/libs/configure.php
View file

@ -403,6 +403,11 @@ class Configure extends Object {
} }
Cache::config('default'); Cache::config('default');
} }
if (!include(CONFIGS . 'bootstrap.php')) {
trigger_error(sprintf(__("Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
}
if (App::path('controllers') == array()) { if (App::path('controllers') == array()) {
App::build(array( App::build(array(
'models' => $modelPaths, 'views' => $viewPaths, 'controllers' => $controllerPaths, 'models' => $modelPaths, 'views' => $viewPaths, 'controllers' => $controllerPaths,
@ -411,15 +416,6 @@ class Configure extends Object {
'shells' => $shellPaths, 'libs' => $libPaths 'shells' => $shellPaths, 'libs' => $libPaths
)); ));
} }
if (!include(CONFIGS . 'bootstrap.php')) {
trigger_error(sprintf(__("Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
}
Configure::buildPaths(compact(
'modelPaths', 'viewPaths', 'controllerPaths', 'helperPaths', 'componentPaths',
'behaviorPaths', 'pluginPaths', 'vendorPaths', 'localePaths', 'shellPaths'
));
} }
} }
} }