Fixed erikdubbelboer#46

erikdubbelboer · erikdubbelboer · commit b4446e2877b3 · 2014-04-24T08:53:37.000Z
diff --git a/includes/functions.inc.php b/includes/functions.inc.php
@@ -2,7 +2,7 @@
 
 function format_html($str, $from_encoding = FALSE) {
   $res = $from_encoding ? mb_convert_encoding($str, 'utf-8', $from_encoding) : $str;
-  $res = htmlentities($res, ENT_QUOTES | ENT_SUBSTITUTE, 'utf-8');
+  $res = htmlentities($res, defined('ENT_SUBSTITUTE') ? (ENT_QUOTES | ENT_SUBSTITUTE) : ENT_QUOTES, 'utf-8');
   return ($res || !$str) ? $res :  '(' . strlen($str) . ' bytes)';
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`function format_html($str, $from_encoding = FALSE) {`
`4`	`4`	`$res = $from_encoding ? mb_convert_encoding($str, 'utf-8', $from_encoding) : $str;`
`5`		`- $res = htmlentities($res, ENT_QUOTES \| ENT_SUBSTITUTE, 'utf-8');`
	`5`	`+ $res = htmlentities($res, defined('ENT_SUBSTITUTE') ? (ENT_QUOTES \| ENT_SUBSTITUTE) : ENT_QUOTES, 'utf-8');`
`6`	`6`	`return ($res \|\| !$str) ? $res : '(' . strlen($str) . ' bytes)';`
`7`	`7`	`}`
`8`	`8`