Author: nathangray
Date: Wed Apr 20 16:51:34 2016
New Revision: 55783
URL: http://svn.stylite.de/viewvc/egroupware?rev=55783&view=rev
Log:
Fix missing line breaks when merging entries that do not need HTML processing
Modified:
branches/14.2/etemplate/inc/class.bo_merge.inc.php
Modified: branches/14.2/etemplate/inc/class.bo_merge.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/etemplate/inc/class.bo_merge.inc.php?rev=55783&r1=55782&r2=55783&view=diff
==============================================================================
--- branches/14.2/etemplate/inc/class.bo_merge.inc.php (original)
+++ branches/14.2/etemplate/inc/class.bo_merge.inc.php Wed Apr 20 16:51:34 2016
@@ -1110,6 +1110,11 @@
if($this->parse_html_styles)
{
$replacements = str_replace(array('&',"\r","\n",'&lt;','&gt;'),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);
}
}
return str_replace(array_keys($replacements),array_values($replacements),$content);
------------------------------------------------------------------------------
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!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.