aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-12-06 16:12:45 -0800
committerfriendica <info@friendica.com>2012-12-06 16:12:45 -0800
commit0bcbcc3b5a3240610655cb3d3c5c46bafdc37c13 (patch)
tree18b026db77b9087efec6ac4d3bebfb9c4015464e
parent6ed27f9503d62b5c97e22318689b2584320feaec (diff)
downloadvolse-hubzilla-0bcbcc3b5a3240610655cb3d3c5c46bafdc37c13.tar.gz
volse-hubzilla-0bcbcc3b5a3240610655cb3d3c5c46bafdc37c13.tar.bz2
volse-hubzilla-0bcbcc3b5a3240610655cb3d3c5c46bafdc37c13.zip
use consistent quote encoding
-rw-r--r--include/network.php2
-rw-r--r--include/text.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/include/network.php b/include/network.php
index 47fa1d939..333e0e83f 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1044,7 +1044,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
// replace the special char encoding
- $s = htmlspecialchars($s,ENT_QUOTES,'UTF-8');
+ $s = htmlspecialchars($s,ENT_COMPAT,'UTF-8');
return $s;
}
diff --git a/include/text.php b/include/text.php
index b97b21981..fcfadec96 100644
--- a/include/text.php
+++ b/include/text.php
@@ -70,7 +70,7 @@ function notags($string) {
if(! function_exists('escape_tags')) {
function escape_tags($string) {
- return(htmlspecialchars($string, ENT_QUOTES, 'UTF-8', false));
+ return(htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false));
}}
@@ -963,7 +963,7 @@ function prepare_body($item,$attach = false) {
foreach($terms as $t) {
if(strlen($x))
$x .= ',';
- $x .= htmlspecialchars($t['term'],ENT_QUOTES,'UTF-8')
+ $x .= htmlspecialchars($t['term'],ENT_COMPAT,'UTF-8')
. ((local_user() == $item['uid']) ? ' <a href="' . $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&cat=' . urlencode($t['term']) . '" title="' . t('remove') . '" >' . t('[remove]') . '</a>' : '');
}
if(strlen($x))
@@ -978,7 +978,7 @@ function prepare_body($item,$attach = false) {
foreach($terms as $t) {
if(strlen($x))
$x .= '&nbsp;&nbsp;&nbsp;';
- $x .= htmlspecialchars($t['term'],ENT_QUOTES,'UTF-8')
+ $x .= htmlspecialchars($t['term'],ENT_COMPAT,'UTF-8')
. ' <a href="' . $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&term=' . urlencode($t['term']) . '" title="' . t('remove') . '" >' . t('[remove]') . '</a>';
}
if(strlen($x) && (local_user() == $item['uid']))