extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-27 08:19:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing line breaks when merging entries that do not need HTML processing

Browse Source
This commit is contained in:
Nathan Gray 2016-04-11 15:21:16 +00:00
parent 39d089a4fd
commit ce94f07599
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Storage/Merge.php
View File

@ -1132,6 +1132,11 @@ abstract class Merge
{ {
$replacements = str_replace(array('&',"\r","\n",'<','>'),array('&','',$break,'<','>'),$replacements); $replacements = str_replace(array('&',"\r","\n",'<','>'),array('&','',$break,'<','>'),$replacements);
} }
else
{
// Need to at least handle new lines, or it'll be run together on one line
$replacements = str_replace(array("\r","\n"),array('',$break),$replacements);
}
} }
if ($mimetype == 'application/x-yaml') if ($mimetype == 'application/x-yaml')
{ {