From 9449d78144473ec8300ab01d1e925954b1042a36 Mon Sep 17 00:00:00 2001 From: Boy132 Date: Sat, 13 Dec 2025 00:15:45 +0100 Subject: [PATCH] Don't convert `Windows-1252` encoding (#1991) --- app/Filament/Admin/Resources/Servers/Pages/EditServer.php | 2 +- app/Filament/Server/Resources/Files/Pages/EditFiles.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Filament/Admin/Resources/Servers/Pages/EditServer.php b/app/Filament/Admin/Resources/Servers/Pages/EditServer.php index 5cf7cece1..4db27aa79 100644 --- a/app/Filament/Admin/Resources/Servers/Pages/EditServer.php +++ b/app/Filament/Admin/Resources/Servers/Pages/EditServer.php @@ -336,7 +336,7 @@ class EditServer extends EditRecord try { $logs = $serverRepository->setServer($server)->getInstallLogs(); - return mb_convert_encoding($logs, 'UTF-8', ['UTF-8', 'UTF-16', 'ISO-8859-1', 'Windows-1252', 'ASCII']); + return mb_convert_encoding($logs, 'UTF-8', ['UTF-8', 'UTF-16', 'ISO-8859-1', 'ASCII']); } catch (ConnectionException) { Notification::make() ->title(trans('admin/server.notifications.error_connecting', ['node' => $server->node->name])) diff --git a/app/Filament/Server/Resources/Files/Pages/EditFiles.php b/app/Filament/Server/Resources/Files/Pages/EditFiles.php index 48e28b038..b9737d661 100644 --- a/app/Filament/Server/Resources/Files/Pages/EditFiles.php +++ b/app/Filament/Server/Resources/Files/Pages/EditFiles.php @@ -173,7 +173,7 @@ class EditFiles extends Page try { $contents = $this->getDaemonFileRepository()->getContent($this->path, config('panel.files.max_edit_size')); - return mb_convert_encoding($contents, 'UTF-8', ['UTF-8', 'UTF-16', 'ISO-8859-1', 'Windows-1252', 'ASCII']); + return mb_convert_encoding($contents, 'UTF-8', ['UTF-8', 'UTF-16', 'ISO-8859-1', 'ASCII']); } catch (FileSizeTooLargeException) { AlertBanner::make('file_too_large') ->title(trans('server/file.alerts.file_too_large.title', ['name' => basename($this->path)]))