diff --git a/App/Manager/Updater/CMSUpdaterManager.php b/App/Manager/Updater/CMSUpdaterManager.php index b2042bda..a8b6674a 100644 --- a/App/Manager/Updater/CMSUpdaterManager.php +++ b/App/Manager/Updater/CMSUpdaterManager.php @@ -25,7 +25,7 @@ public function doUpdate(array $updateData): void { if (!isset($updateData['file_update'])) { Flash::send(Alert::ERROR, LangManager::translate('core.toaster.error'), - LangManager::translate('core.updates.errors.fileUpdate')); + LangManager::translate('core.updates.errors.nullFileUpdate')); return; } diff --git a/App/Package/Core/Controllers/UpdatesController.php b/App/Package/Core/Controllers/UpdatesController.php index a2442ecc..58ee430b 100644 --- a/App/Package/Core/Controllers/UpdatesController.php +++ b/App/Package/Core/Controllers/UpdatesController.php @@ -5,6 +5,9 @@ use CMW\Controller\Users\UsersController; use CMW\Manager\Api\PublicAPI; use CMW\Manager\Cache\SimpleCacheManager; +use CMW\Manager\Flash\Alert; +use CMW\Manager\Flash\Flash; +use CMW\Manager\Lang\LangManager; use CMW\Manager\Package\AbstractController; use CMW\Manager\Router\Link; use CMW\Manager\Updater\CMSUpdaterManager; @@ -78,6 +81,14 @@ private function adminUpdatesInstall(): void { UsersController::redirectIfNotHavePermissions('core.dashboard', 'core.update'); + $currentVersion = UpdatesManager::getVersion(); + + if ($currentVersion === 'DEV') { + Flash::send(Alert::ERROR, LangManager::translate('core.toaster.error'), + LangManager::translate('core.updates.errors.devVersion')); + Redirect::redirectPreviousRoute(); + } + // We get all the new version id. $versions = PublicAPI::postData('cms/update', ['current_version' => UpdatesManager::getVersion()]); diff --git a/App/Package/Core/Lang/en.php b/App/Package/Core/Lang/en.php index 898103e4..51094159 100644 --- a/App/Package/Core/Lang/en.php +++ b/App/Package/Core/Lang/en.php @@ -318,6 +318,7 @@ 'deletedFiles' => 'Unable to delete old files.', 'deleteFile' => 'Unable to delete file %file%', 'sqlUpdate' => 'Unable to update your database.', + 'devVersion' => 'You are using a development version of CraftMyWebsite, updates are not available.', ], 'success' => 'Website update with success', ], diff --git a/App/Package/Core/Lang/fr.php b/App/Package/Core/Lang/fr.php index d737bb35..39f887fd 100644 --- a/App/Package/Core/Lang/fr.php +++ b/App/Package/Core/Lang/fr.php @@ -318,6 +318,7 @@ "deletedFiles" => "Impossible de supprimer les anciens fichiers.", "deleteFile" => "Impossible de supprimer le fichier %file%", "sqlUpdate" => "Impossible de mettre à jour la base de données.", + 'devVersion' => 'Vous utilisez une version de développement de CraftMyWebsite, impossible de mettre à jour.', ], 'success' => 'Mise à jour de votre site réussie', ],