Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 14:30:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move AppMode

Browse source
This commit is contained in:
Philipp Holzer 2019-03-14 02:36:49 +01:00 • committed by Hypolite Petovan
parent d03dedee63
commit 1a2527cdba
7 changed files with 49 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/Core/Config/Cache/ConfigCacheLoader.php
View file

@ -2,6 +2,7 @@
namespace Friendica\Core\Config\Cache;
use Friendica\App;
use Friendica\Core\Addon;
/**
@ -23,8 +24,14 @@ class ConfigCacheLoader
private $baseDir;
private $configDir;
public function __construct($baseDir)
/**
* @var App\Mode
*/
private $appMode;
public function __construct($baseDir, App\Mode $mode)
{
$this->appMode = $mode;
$this->baseDir = $baseDir;
$this->configDir = $baseDir . DIRECTORY_SEPARATOR . self::SUBDIRECTORY;
}
@ -34,8 +41,12 @@ class ConfigCacheLoader
*
* First loads the default value for all the configuration keys, then the legacy configuration files, then the
* expected local.config.php
*
* @param IConfigCache The config cache to load to
*
* @throws \Exception
*/
public function loadConfigFiles(ConfigCache $config)
public function loadConfigFiles(IConfigCache $config)
{
$config->load($this->loadCoreConfig('defaults'));
$config->load($this->loadCoreConfig('settings'));
@ -44,6 +55,12 @@ class ConfigCacheLoader
$config->load($this->loadLegacyConfig('htconfig'), true);
$config->load($this->loadCoreConfig('local'), true);
// In case of install mode, add the found basepath (because there isn't a basepath set yet
if ($this->appMode->isInstall()) {
// Setting at least the basepath we know
$config->set('system', 'basepath', $this->baseDir);
}
}
/**