diff options
Diffstat (limited to 'internal/ui/settings_update.go')
| -rw-r--r-- | internal/ui/settings_update.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/internal/ui/settings_update.go b/internal/ui/settings_update.go index e0059d4d..0e03752d 100644 --- a/internal/ui/settings_update.go +++ b/internal/ui/settings_update.go @@ -6,6 +6,7 @@ package ui // import "miniflux.app/v2/internal/ui" import ( "net/http" "regexp" + "strings" "miniflux.app/v2/internal/http/request" "miniflux.app/v2/internal/http/response/html" @@ -58,6 +59,9 @@ func (h *handler) updateSettings(w http.ResponseWriter, r *http.Request) { cleanEnd := regexp.MustCompile(`(?m)\r\n\s*$`) settingsForm.BlockFilterEntryRules = cleanEnd.ReplaceAllLiteralString(settingsForm.BlockFilterEntryRules, "") settingsForm.KeepFilterEntryRules = cleanEnd.ReplaceAllLiteralString(settingsForm.KeepFilterEntryRules, "") + // Clean carriage returns for Windows environments + settingsForm.BlockFilterEntryRules = strings.ReplaceAll(settingsForm.BlockFilterEntryRules, "\r\n", "\n") + settingsForm.KeepFilterEntryRules = strings.ReplaceAll(settingsForm.KeepFilterEntryRules, "\r\n", "\n") if validationErr := settingsForm.Validate(); validationErr != nil { view.Set("errorMessage", validationErr.Translate(loggedUser.Language)) |