Author: nathangray
New Revision: 55215
URL: http://svn.stylite.de/viewvc/egroupware?rev=55215&view=rev
Log:
If we are not processing styles, just encode special characters.
Fixes broken downloads, missing bits if there were <> in the text
Modified:
trunk/etemplate/inc/class.bo_merge.inc.php
— trunk/etemplate/inc/class.bo_merge.inc.php (original)
+++ trunk/etemplate/inc/class.bo_merge.inc.php Tue Mar 1 23:31:19 2016
@@ -1012,7 +1012,8 @@
continue;
}
// decode html entities back to utf-8
-
-
if (is_string($value) && (strpos($value,'&') !== false) && $this->parse_html_styles)
{
$value = html_entity_decode($value,ENT_QUOTES,$charset);
@@ -1022,8 +1023,13 @@
$value = preg_replace(’/&[^; ]+;/’,’’,$value);
}
}
-
// remove all html tags, evtl. included
-
if (is_string($value) && (strpos($value,'<') !== false))
-
-
if(!$this->parse_html_styles)
-
{
-
// Encode special chars so they don't break the file
-
$value = htmlspecialchars($value,ENT_NOQUOTES);
-
}
-
else if (is_string($value) && (strpos($value,'<') !== false))
{
// Clean HTML, if it's being kept
if($replace_tags && extension_loaded('tidy')) {
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
