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

Updating cache config check in Configure::__loadBootstrap()

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6007 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-11-16 20:07:38 +00:00
parent 1b93e79361
commit 97dd2ea2ea
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cake/config/config.php
View file

@ -25,4 +25,5 @@
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
return $config['Cake.version'] = '1.2.0.5875 pre-beta';
$config['Cake.Debugger.HelpPath'] = 'http://cookbook.cakephp.org/errors/';
?>

29
cake/libs/configure.php
View file

@ -505,7 +505,7 @@ class Configure extends Object {
* @access private
*/
function __loadBootstrap($boot) {
$_this =& Configure::getInstance();
$_this =& Configure::getInstance(false);
$modelPaths = $viewPaths = $controllerPaths = $helperPaths = $componentPaths = $behaviorPaths = $pluginPaths = null;
if ($boot) {
@ -518,21 +518,22 @@ class Configure extends Object {
if (!include(APP_PATH . 'config' . DS . '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 ($_this->read('Cache.disable') !== true) {
$cache = Cache::settings();
if(empty($cache)) {
trigger_error('Cache not configured properly. Please check Cache::config(); in APP/config/core.php', E_USER_WARNING);
Cache::config('default', array('engine' => 'File'));
$cache = Cache::settings();
}
$settings = array('prefix' => 'cake_core_', 'path' => CACHE . 'persistent' . DS);
if (Configure::read() > 1) {
$settings = array('prefix' => 'cake_core_', 'duration' => 10, 'path' => CACHE . 'persistent' . DS);
}
Cache::config('_cake_core_' , array_merge($cache, $settings));
}
}
if($_this->read('Cache.disable') !== true) {
$cache = Cache::settings();
if(empty($cache)) {
trigger_error('Cache not configured properly. Please check Cache::config(); in APP/config/core.php', E_USER_WARNING);
Cache::config('default', array('engine' => 'File'));
$cache = Cache::settings();
}
$settings = array('prefix' => 'cake_core_', 'path' => CACHE . 'persistent' . DS);
if (Configure::read() > 1) {
$settings = array('prefix' => 'cake_core_', 'duration' => 10, 'path' => CACHE . 'persistent' . DS);
}
Cache::config('_cake_core_' , array_merge($cache, $settings));
}
$_this->__buildPaths(compact('modelPaths', 'viewPaths', 'controllerPaths', 'helperPaths', 'componentPaths', 'behaviorPaths', 'pluginPaths'));
if (defined('BASE_URL')) {