From 899ab4e3227c75de0b5f485318c55cc9398cc307 Mon Sep 17 00:00:00 2001 From: gillobis Date: Thu, 6 Mar 2025 17:27:57 +0100 Subject: [PATCH 1/2] fix: handle a possible issue from output buffer --- packages/actions/src/Exports/Downloaders/XlsxDownloader.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/actions/src/Exports/Downloaders/XlsxDownloader.php b/packages/actions/src/Exports/Downloaders/XlsxDownloader.php index 3096d9b5ea..9e07de60e9 100644 --- a/packages/actions/src/Exports/Downloaders/XlsxDownloader.php +++ b/packages/actions/src/Exports/Downloaders/XlsxDownloader.php @@ -24,7 +24,9 @@ class XlsxDownloader implements Downloader $fileName = $export->file_name . '.xlsx'; if ($disk->exists($filePath = $directory . DIRECTORY_SEPARATOR . $fileName)) { - return $disk->download($filePath); + $response = $disk->download($filePath); + ob_end_clean(); + return $response; } $writer = app(Writer::class); From 2a376e4e7c508ac4285544fac13139ed4d960cff Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Thu, 6 Mar 2025 21:03:37 +0000 Subject: [PATCH 2/2] Update packages/actions/src/Exports/Downloaders/XlsxDownloader.php --- packages/actions/src/Exports/Downloaders/XlsxDownloader.php | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/actions/src/Exports/Downloaders/XlsxDownloader.php b/packages/actions/src/Exports/Downloaders/XlsxDownloader.php index 9e07de60e9..0660085ad0 100644 --- a/packages/actions/src/Exports/Downloaders/XlsxDownloader.php +++ b/packages/actions/src/Exports/Downloaders/XlsxDownloader.php @@ -26,6 +26,7 @@ class XlsxDownloader implements Downloader if ($disk->exists($filePath = $directory . DIRECTORY_SEPARATOR . $fileName)) { $response = $disk->download($filePath); ob_end_clean(); + return $response; }