diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-03-04 13:30:45 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-03-04 13:30:45 +0100 |
| commit | b3239256dc6d188cda970adab516b3fcf1b86129 (patch) | |
| tree | d8e65dd9784834ba2e82ce7ee94b4718f8af19ea /app/install.php | |
| parent | 27b71ffa99f7dff013fb8d51d020ed628e0d2ce6 (diff) | |
| parent | 0fe0ce894cbad09757d719dd4b400b9862c1a12a (diff) | |
Merge branch 'edge' into latest
Diffstat (limited to 'app/install.php')
| -rw-r--r-- | app/install.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/app/install.php b/app/install.php index 9d0d855b8..3163367f4 100644 --- a/app/install.php +++ b/app/install.php @@ -283,11 +283,7 @@ function freshrss_already_installed() { // A configuration file already exists, we try to load it. $system_conf = null; try { - Minz_Configuration::register('system', $conf_path); - /** - * @var FreshRSS_SystemConfiguration $system_conf - */ - $system_conf = Minz_Configuration::get('system'); + $system_conf = FreshRSS_SystemConfiguration::init($conf_path); } catch (Minz_FileNotExistException $e) { return false; } @@ -295,7 +291,7 @@ function freshrss_already_installed() { // ok, the global conf exists… but what about default user conf? $current_user = $system_conf->default_user; try { - Minz_Configuration::register('user', join_path(USERS_PATH, $current_user, 'config.php')); + FreshRSS_UserConfiguration::init(USERS_PATH . '/' . $current_user . '/config.php'); } catch (Minz_FileNotExistException $e) { return false; } @@ -449,7 +445,7 @@ function printStep1() { <?php } else { ?> <p class="alert alert-error"><?= _t('install.action.fix_errors_before') ?></p> <a id="actualize" class="btn" href="./index.php?step=1" title="<?= _t('install.check.reload') ?>"> - <img class="icon" src="../themes/icons/refresh.svg" alt="🔃" /> + <img class="icon" src="../themes/icons/refresh.svg" alt="🔃" loading="lazy" /> </a> <?php } ?> <?php @@ -680,7 +676,7 @@ if (_t('gen.dir') === 'rtl') { <div class="item title"> <div id="logo-wrapper"> <a href="./"> - <img class="logo" src="../themes/icons/FreshRSS-logo.svg" alt=""> + <img class="logo" src="../themes/icons/FreshRSS-logo.svg" alt="" loading="lazy"> </a> </div> </div> |