From 9d7e10604bb5161e9a31bc548ad536f6a5de3f86 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 18 Feb 2023 08:41:01 +0100 Subject: [PATCH] bug pre update fresh install bug slash --- core/include/pre-update.php | 39 +++++++++++++++++++------------------ core/include/update.inc.php | 2 +- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/core/include/pre-update.php b/core/include/pre-update.php index 84431dd6..8392090f 100644 --- a/core/include/pre-update.php +++ b/core/include/pre-update.php @@ -1,27 +1,28 @@ 'fr_FR', - 'en' => 'en_EN', - 'pt' => 'pt_PT' - ]; - // Convertit les dossiers vers la nouvelle structure - foreach ($languages as $key => $value) { - if ( - is_dir('site/data/' . $key) && - !is_dir('site/data/' . $value) - ) { - $end = rename('site/data/' . $key, 'site/data/' . $value); + +if (file_exists('site/data/core.json')) { + $version = json_decode(file_get_contents('site/data/core.json'), true); + + if ($version['core']['dataVersion'] < 12000) { + // Correspondance pour les dossiers de langue à convertir + $languages = [ + 'fr' => 'fr_FR', + 'en' => 'en_EN', + 'pt' => 'pt_PT' + ]; + // Convertit les dossiers vers la nouvelle structure + foreach ($languages as $key => $value) { + if ( + is_dir('site/data/' . $key) && + !is_dir('site/data/' . $value) + ) { + $end = rename('site/data/' . $key, 'site/data/' . $value); + } } + sleep(2); } - sleep(2); } \ No newline at end of file diff --git a/core/include/update.inc.php b/core/include/update.inc.php index 42234a41..0b3f3be8 100644 --- a/core/include/update.inc.php +++ b/core/include/update.inc.php @@ -950,7 +950,7 @@ if ($this->getData(['core', 'dataVersion']) < 12300) { } // Nettoyage de flatPickr - $this->removeDir('core\vendor\flatpickr'); + $this->removeDir('core/vendor/flatpickr'); // Mise à jour $this->setData(['core', 'dataVersion', 12300]);