From 5ae0be2323bc5b0fa5137e22779b3fcaf75fc41b Mon Sep 17 00:00:00 2001 From: slawkens Date: Mon, 12 Feb 2024 21:43:55 +0100 Subject: [PATCH] Revert "Fix installation" This reverts commit 9c318f9012a4d1a484bd1b63e99240193cba4669. --- install/steps/7-finish.php | 9 +++++++++ install/tools/7-finish.php | 12 +----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/install/steps/7-finish.php b/install/steps/7-finish.php index 350c02f4..a2f083dc 100644 --- a/install/steps/7-finish.php +++ b/install/steps/7-finish.php @@ -137,5 +137,14 @@ else { } $_SESSION['installed'] = true; } + + foreach($_SESSION as $key => $value) { + if(strpos($key, 'var_') !== false) + unset($_SESSION[$key]); + } + unset($_SESSION['saved']); + if(file_exists(CACHE . 'install.txt')) { + unlink(CACHE . 'install.txt'); + } } } diff --git a/install/tools/7-finish.php b/install/tools/7-finish.php index 280e9945..ab04a1e4 100644 --- a/install/tools/7-finish.php +++ b/install/tools/7-finish.php @@ -97,18 +97,8 @@ require_once SYSTEM . 'migrations/22.php'; require_once SYSTEM . 'migrations/27.php'; require_once SYSTEM . 'migrations/30.php'; -foreach($_SESSION as $key => $value) { - if(str_contains($key, 'var_')) - unset($_SESSION[$key]); -} - -unset($_SESSION['saved']); -if(file_exists(CACHE . 'install.txt')) { - unlink(CACHE . 'install.txt'); -} - $locale['step_finish_desc'] = str_replace('$ADMIN_PANEL$', generateLink(str_replace('tools/', '',ADMIN_URL), $locale['step_finish_admin_panel'], true), $locale['step_finish_desc']); $locale['step_finish_desc'] = str_replace('$HOMEPAGE$', generateLink(str_replace('tools/', '', BASE_URL), $locale['step_finish_homepage'], true), $locale['step_finish_desc']); $locale['step_finish_desc'] = str_replace('$LINK$', generateLink('https://my-aac.org', 'https://my-aac.org', true), $locale['step_finish_desc']); -success($locale['step_finish_desc']); +success($locale['step_finish_desc']); \ No newline at end of file