D154.diff
No OneTemporary
Actions

Subscribers

None

File Metadata

	Index: branches/5.2.x/core/kernel/utility/unit_config_reader.php
	===================================================================
	--- branches/5.2.x/core/kernel/utility/unit_config_reader.php
	+++ branches/5.2.x/core/kernel/utility/unit_config_reader.php
	@@ -185,13 +185,23 @@

	function includeConfigFiles($folderPath, $cache = true)
	{
	+ $data = false;
	$this->Application->refreshModuleInfo();

	- if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
	- $data = $this->Application->getCache('master:config_files', false, $cache ? CacheSettings::$unitCacheRebuildTime : 0);
	- }
	- else {
	- $data = $this->Application->getDBCache('config_files', $cache ? CacheSettings::$unitCacheRebuildTime : 0);
	+ if ( $cache ) {
	+ if ( $this->Application->isCachingType(CACHING_TYPE_MEMORY) ) {
	+ $data = $this->Application->getCache(
	+ 'master:config_files',
	+ false,
	+ CacheSettings::$unitCacheRebuildTime
	+ );
	+ }
	+ else {
	+ $data = $this->Application->getDBCache(
	+ 'config_files',
	+ CacheSettings::$unitCacheRebuildTime
	+ );
	+ }
	}

	if ( $data ) {