From a2c7628722cd03a0b1623fa8c1f81ada0fc88c90 Mon Sep 17 00:00:00 2001 From: Clemente Raposo Date: Mon, 13 Jan 2025 13:06:39 +0000 Subject: [PATCH] Fix message handling on InstallActionHandler --- .../Service/Installation/InstallActionHandler.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/core/backend/Install/Service/Installation/InstallActionHandler.php b/core/backend/Install/Service/Installation/InstallActionHandler.php index 2f72b9101..5dd784a81 100644 --- a/core/backend/Install/Service/Installation/InstallActionHandler.php +++ b/core/backend/Install/Service/Installation/InstallActionHandler.php @@ -133,7 +133,7 @@ class InstallActionHandler implements ProcessHandlerInterface } } - if(!empty($missingOptions)){ + if (!empty($missingOptions)) { $process->setStatus('error'); $process->setMessages(['Missing required options: ' . implode(', ', $missingOptions)]); $process->setData([]); @@ -232,11 +232,17 @@ class InstallActionHandler implements ProcessHandlerInterface return ['LBL_SILENT_INSTALL_SUCCESS']; } + $messages = []; + if (!empty($result->getMessageLabels())) { - return [$result->getMessageLabels()[0]]; + $messages = $result->getMessageLabels(); } - return $result->getMessageLabels(); + if (!empty($result->getMessages())) { + $messages = array_merge($messages, $result->getMessages()); + } + + return $messages; } }