lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consistent management of carriage returns

Browse Source
This commit is contained in:
Thomas Negre 2022-11-16 14:08:41 +01:00
parent a00331c478
commit 00c62bf150
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/includes/odtphp/odf.php
View File

@ -206,9 +206,9 @@ class Odf
} }
else { else {
$convertedValue = $this->encode_chars($convertedValue, $encode, $charset); $convertedValue = $this->encode_chars($convertedValue, $encode, $charset);
$convertedValue = preg_replace('/(\r\n|\r|\n)/i', "<text:line-break/>", $convertedValue);
} }
$convertedValue = preg_replace('/(\r\n|\r|\n)/i', "<text:line-break/>", $convertedValue);
return $convertedValue; return $convertedValue;
} }

8
test/phpunit/ODFTest.php
View File

@ -342,6 +342,14 @@ class ODFTest extends PHPUnit\Framework\TestCase
'charset' => null, 'charset' => null,
'expected' => "123 trucmachin &gt; truc &lt; troc &gt; tracbla bla", 'expected' => "123 trucmachin &gt; truc &lt; troc &gt; tracbla bla",
], ],
// HTML should not take \n into account, but only <br />.
30 => [
'to_convert' => "text with <strong>strong text </strong>, a line\nbreak and <u>underlined</u> words with <i>it@lic sp&ciàlchärs éè l'</i>",
'encode' => false,
'charset' => 'UTF-8',
'expected' => 'text with <text:span text:style-name="boldText">strong text </text:span>, a line'."\n".'break and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&ciàlchärs éè l\'</text:span>',
],
]; ];
$odf=new Odf($filename, array()); $odf=new Odf($filename, array());