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
This commit is contained in:
mark_story 2014-11-22 12:21:28 -05:00
parent 23c5805763
commit b6caddcf49

View file

@ -148,6 +148,8 @@ App::uses('Cache', 'Cache');
App::uses('Object', 'Core'); App::uses('Object', 'Core');
App::uses('Multibyte', 'I18n'); App::uses('Multibyte', 'I18n');
App::$bootstrapping = true;
/** /**
* Full URL prefix * Full URL prefix
*/ */
@ -170,8 +172,6 @@ Configure::write('App.imageBaseUrl', IMAGES_URL);
Configure::write('App.cssBaseUrl', CSS_URL); Configure::write('App.cssBaseUrl', CSS_URL);
Configure::write('App.jsBaseUrl', JS_URL); Configure::write('App.jsBaseUrl', JS_URL);
App::$bootstrapping = true;
Configure::bootstrap(isset($boot) ? $boot : true); Configure::bootstrap(isset($boot) ? $boot : true);
if (function_exists('mb_internal_encoding')) { if (function_exists('mb_internal_encoding')) {