Merge pull request #13246 from Dolibarr/11.0

Can process lang files with windows format (even if all lang files must have linux format)
This commit is contained in:
Laurent Destailleur 2020-03-02 21:46:27 +01:00 committed by GitHub
commit 6d01aee2f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -282,7 +282,7 @@ class Translate
* and split the rest until a line feed.
* This is more efficient than fgets + explode + trim by a factor of ~2.
*/
while ($line = fscanf($fp, "%[^= ]%*[ =]%[^\n]"))
while ($line = fscanf($fp, "%[^= ]%*[ =]%[^\n\r]"))
{
if (isset($line[1]))
{