viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-29 23:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Yuri Kuznetsov
2021-08-04 20:00:14 +03:00
parent de69cf7ceb
commit 76361d1ca9
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/Espo/Core/Utils/Config.php
View File

@@ -322,6 +322,14 @@ class Config
$this->fileManager->setConfig($this);
}
/**
* Get all parameters.
*/
public function getAllData(): stdClass
{
return (object) $this->getData();
}
/**
* Get all parameters excluding those that are set in the internal config.
*/

11
install/core/Installer.php
View File

@@ -112,16 +112,17 @@ class Installer
if (!file_exists($configPath)) {
$fileManager->putPhpContents($configPath, []);
$config->update();
}
$app = new Application();
$configData = include('data/config.php');
$configData = get_object_vars($config->getAllData());
$defaultData = $config->getDefaults();
$configWriterFileManager = new ConfigWriterFileManager(null, $configData['defaultPermissions'] ?? null);
/** @var InjectableFactory $injectableFactory */
$injectableFactory = $app->getContainer()->get('injectableFactory');
$injectableFactory = (new Application())->getContainer()->get('injectableFactory');
$configWriter = $injectableFactory->createWithBinding(
ConfigWriter::class,
@@ -131,8 +132,6 @@ class Installer
->build()
);
$defaultData = $config->getDefaults();
// Save default data if does not exist.
if (!Util::arrayKeysExists(array_keys($defaultData), $configData)) {
$defaultData = array_replace_recursive($defaultData, $configData);