From 0cf684300d2f54e97929e4e04ccb713d9f3e7630 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Thu, 22 Apr 2021 11:44:11 +0300 Subject: [PATCH] Fixed text field maxlength validation newline issue [#3324] --- CHANGELOG.md | 3 ++- system/src/Grav/Common/Data/Validation.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6627b71d8..17f378b1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,10 @@ 1. [](#improved) * Moved `gregwar/Image` and `gregwar/Cache` in-house to official `getgrav/Image` and `getgrav/Cache` packagist packages. This will help environments with very strict proxy setups that don't allow VCS setup. [#3289](https://github.com/getgrav/grav/issues/3289) - * Improved XSS Invalid Protocol detection regex [#3298](https://github.com/getgrav/grav/issues/3298) + * Improved XSS Invalid Protocol detection regex [#3298](https://github.com/getgrav/grav/issues/3298) 1. [](#bugfix) * Fixed `The "Grav/Common/Twig/TwigExtension" extension is not enabled` when using markdown twig tag [#3317](https://github.com/getgrav/grav/issues/3317) + * Fixed text field maxlength validation newline issue [#3324](https://github.com/getgrav/grav/issues/3324) # v1.7.12 ## 04/15/2021 diff --git a/system/src/Grav/Common/Data/Validation.php b/system/src/Grav/Common/Data/Validation.php index 4cba620af..bb3fdd18c 100644 --- a/system/src/Grav/Common/Data/Validation.php +++ b/system/src/Grav/Common/Data/Validation.php @@ -238,6 +238,7 @@ class Validation $value = trim($value); } + $value = preg_replace("/\r\n|\r/um", "\n", $value); $len = mb_strlen($value); $min = (int)($params['min'] ?? 0); @@ -280,7 +281,7 @@ class Validation $value = trim($value); } - return $value; + return preg_replace("/\r\n|\r/um", "\n", $value); } /**