From 272cff1cd9c21915e07329342373d688f0831098 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Fri, 21 Jul 2023 14:41:31 +0300
Subject: [PATCH] installer fixes

---
 install/core/Installer.php     | 5 +++++
 install/core/actions/main.php  | 2 +-
 install/core/tpl/header.tpl    | 2 +-
 install/entry.php              | 4 ++++
 public/install/css/install.css | 2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/install/core/Installer.php b/install/core/Installer.php
index 5750a52779..1b712ebd58 100644
--- a/install/core/Installer.php
+++ b/install/core/Installer.php
@@ -753,4 +753,9 @@ class Installer
             'scheduledJobId' => $scheduledJob->getId(),
         ]);
     }
+
+    public function getLogoSrc(string $theme): string
+    {
+        return $this->getMetadata()->get(['themes', $theme, 'logo']) ?? 'client/img/logo.svg';
+    }
 }
diff --git a/install/core/actions/main.php b/install/core/actions/main.php
index 9dd9e8c6d9..d613d95cf1 100644
--- a/install/core/actions/main.php
+++ b/install/core/actions/main.php
@@ -55,4 +55,4 @@ foreach ($installer->getThemeList() as $item) {
 
 $smarty->assign('themeLabel', $language->translate('theme', 'fields', 'Settings'));
 $smarty->assign('fields', $fields);
-$smarty->assign("themes", $themes);
\ No newline at end of file
+$smarty->assign("themes", $themes);
diff --git a/install/core/tpl/header.tpl b/install/core/tpl/header.tpl
index 891c1e8975..aa008d471b 100644
--- a/install/core/tpl/header.tpl
+++ b/install/core/tpl/header.tpl
@@ -1,5 +1,5 @@
 <div class="panel-heading main-header">
-    <img src="../client/img/logo.svg" style="height: 43px;">
+    <img src="../{$logoSrc}" style="height: 43px;">
 </div>
 <header class="step-header">
     <div class="row">
diff --git a/install/entry.php b/install/entry.php
index 8a4b9af4c6..716fb04808 100644
--- a/install/entry.php
+++ b/install/entry.php
@@ -204,6 +204,10 @@ if (Utils::checkActionExists($action)) {
     include $actionFile;
 }
 
+$theme = $_SESSION['install']['theme'] ?? $config->get('theme');
+
+$smarty->assign('logoSrc', $installer->getLogoSrc($theme));
+
 $loaderParamsProvider = $installer->getInjectableFactory()->create(LoaderParamsProvider::class);
 
 if (!empty($actionFile) && file_exists('install/core/tpl/' . $tplName)) {
diff --git a/public/install/css/install.css b/public/install/css/install.css
index 44e19b9633..bfd0e9e8de 100644
--- a/public/install/css/install.css
+++ b/public/install/css/install.css
@@ -150,7 +150,7 @@ header.step-header h4 {
 }
 
 .panel .modal-footer {
-    background-color: var(--panel-bg) !important;
+    background-color: transparent;
 
     border-bottom-left-radius: var(--panel-border-radius);
     border-bottom-right-radius: var(--panel-border-radius);