From 76361d1ca9b617caeaaa4ddb48d375eea6723eff Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Wed, 4 Aug 2021 20:00:14 +0300
Subject: [PATCH] fix

---
 application/Espo/Core/Utils/Config.php |  8 ++++++++
 install/core/Installer.php             | 11 +++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/application/Espo/Core/Utils/Config.php b/application/Espo/Core/Utils/Config.php
index 8640c04810..59c4f53b1a 100644
--- a/application/Espo/Core/Utils/Config.php
+++ b/application/Espo/Core/Utils/Config.php
@@ -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.
      */
diff --git a/install/core/Installer.php b/install/core/Installer.php
index 459f2838e2..1d48297211 100644
--- a/install/core/Installer.php
+++ b/install/core/Installer.php
@@ -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);