Merge branch '4.1' into 'main'

Author: thorsten

phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/UpdateController.php

@@ -249,16 +249,18 @@ public function updateDatabase(): JsonResponse
     {
         $this->userHasPermission(PermissionType::CONFIGURATION_EDIT);
 
-        $this->update->version = System::getVersion();
+        $this->update->version = $this->configuration->get('main.currentVersion');
 
         try {
             if ($this->update->applyUpdates()) {
                 $this->configuration->set('main.maintenanceMode', 'false');
                 return new JsonResponse(['success' => 'Database successfully updated.'], Response::HTTP_OK);
             }
 
+            $this->configuration->set('main.maintenanceMode', 'false');
             return new JsonResponse(['error' => 'Update database failed.'], Response::HTTP_BAD_GATEWAY);
-        } catch (Exception $exception) {
+        } catch (Exception|\Exception $exception) {
+            $this->configuration->set('main.maintenanceMode', 'false');
             return new JsonResponse([
                 'error' => 'Update database failed: ' . $exception->getMessage(),
             ], Response::HTTP_BAD_GATEWAY);

phpmyfaq/src/phpMyFAQ/Setup/UpdateRunner.php

@@ -449,12 +449,14 @@ private function taskUpdateDatabase(SymfonyStyle $symfonyStyle): int
                 return Command::SUCCESS;
             }
 
+            $this->configuration->set(key: 'main.maintenanceMode', value: 'false');
             $this->displayMigrationResults($symfonyStyle, $update->migrationResults);
             $symfonyStyle->error(message: 'Update database failed.');
             return Command::FAILURE;
-        } catch (Exception $exception) {
+        } catch (Exception|\Exception $exception) {
             $progressBar->finish();
             $symfonyStyle->newLine(count: 2);
+            $this->configuration->set(key: 'main.maintenanceMode', value: 'false');
             $symfonyStyle->error(message: 'Update database failed: ' . $exception->getMessage());
             return Command::FAILURE;
         }