From b6caddcf49967a3ce289178d156645a691b1dfff Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 22 Nov 2014 12:21:28 -0500 Subject: [PATCH] Fix file_map being regenerated on every request. A mistake a few months ago caused the file_map to always be regenerated as Configure::write() would cause both Configure and Hash to be loaded, invalidating the file map. By entering bootstrap mode earlier we can avoid that. Refs #5229 --- lib/Cake/bootstrap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Cake/bootstrap.php b/lib/Cake/bootstrap.php index 303d36083..4ad77a21b 100644 --- a/lib/Cake/bootstrap.php +++ b/lib/Cake/bootstrap.php @@ -148,6 +148,8 @@ App::uses('Cache', 'Cache'); App::uses('Object', 'Core'); App::uses('Multibyte', 'I18n'); +App::$bootstrapping = true; + /** * Full URL prefix */ @@ -170,8 +172,6 @@ Configure::write('App.imageBaseUrl', IMAGES_URL); Configure::write('App.cssBaseUrl', CSS_URL); Configure::write('App.jsBaseUrl', JS_URL); -App::$bootstrapping = true; - Configure::bootstrap(isset($boot) ? $boot : true); if (function_exists('mb_internal_encoding')) {