Author: nathangray
New Revision: 55703
URL: http://svn.stylite.de/viewvc/egroupware?rev=55703&view=rev
Log:
Fix missing line breaks when merging entries that do not need HTML processing
Modified:
trunk/egroupware/api/src/Storage/Merge.php
— trunk/egroupware/api/src/Storage/Merge.php (original)
+++ trunk/egroupware/api/src/Storage/Merge.php Mon Apr 11 17:21:16 2016
@@ -1131,6 +1131,11 @@
if($this->parse_html_styles)
{
$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')
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial! http://pubads.g.doubleclick.net/
gampad/clk?id=1444514301&iu=/ca-pub-7940484522588532
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
