diff --git a/src/Controllers/Database/EventsController.php b/src/Controllers/Database/EventsController.php index bcd1bba15d..a7507ec4da 100644 --- a/src/Controllers/Database/EventsController.php +++ b/src/Controllers/Database/EventsController.php @@ -211,9 +211,9 @@ final class EventsController implements InvocableController $exportData = false; } - $itemName = htmlspecialchars(Util::backquote($itemName)); + $itemName = Util::backquote($itemName); if ($exportData !== false) { - $exportData = htmlspecialchars(trim($exportData)); + $exportData = trim($exportData); $title = sprintf(__('Export of event %s'), $itemName); if ($request->isAjax()) { @@ -223,6 +223,8 @@ final class EventsController implements InvocableController return $this->response->response(); } + $exportData = htmlspecialchars($exportData); + $output = '
'; $output .= '

' . $title . '

'; $output .= '
'; @@ -233,7 +235,7 @@ final class EventsController implements InvocableController } else { $message = sprintf( __('Error in processing request: No event with name %1$s found in database %2$s.'), - $itemName, + htmlspecialchars($itemName), htmlspecialchars(Util::backquote(Current::$database)), ); $message = Message::error($message); diff --git a/src/Controllers/Triggers/IndexController.php b/src/Controllers/Triggers/IndexController.php index 71beb7e2fe..a0a24ccd7b 100644 --- a/src/Controllers/Triggers/IndexController.php +++ b/src/Controllers/Triggers/IndexController.php @@ -230,9 +230,9 @@ final class IndexController implements InvocableController $triggerName->getName(), )?->getCreateSql(''); if ($exportData !== null && $request->isAjax()) { - $title = sprintf(__('Export of trigger %s'), htmlspecialchars(Util::backquote($triggerName))); + $title = sprintf(__('Export of trigger %s'), Util::backquote($triggerName)); $this->response->addJSON('title', $title); - $this->response->addJSON('message', htmlspecialchars(trim($exportData))); + $this->response->addJSON('message', trim($exportData)); return $this->response->response(); }