1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-15 13:24:10 +02:00

Merge branch '3.2.x' into 3.3.x

This commit is contained in:
Marc Alexander 2020-04-21 21:47:17 +02:00
commit 0ecc72e945
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

@ -36,7 +36,7 @@ class type_cast_helper implements \phpbb\request\type_cast_helper_interface
if ($type == 'string')
{
$result = str_replace(array("\r\n", "\r", "\0"), array("\n", "\n", ''), $result);
$result = strtr($result, ["\r\n" => "\n", "\r" => "\n", "\0" => '', "\u{FEFF}" => '']);
if ($trim)
{