use consistent quote encoding

This commit is contained in:
friendica 2012-12-06 16:12:45 -08:00
parent 6ed27f9503
commit 0bcbcc3b5a
2 changed files with 4 additions and 4 deletions

View File

@ -1044,7 +1044,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
// replace the special char encoding // replace the special char encoding
$s = htmlspecialchars($s,ENT_QUOTES,'UTF-8'); $s = htmlspecialchars($s,ENT_COMPAT,'UTF-8');
return $s; return $s;
} }

View File

@ -70,7 +70,7 @@ function notags($string) {
if(! function_exists('escape_tags')) { if(! function_exists('escape_tags')) {
function escape_tags($string) { 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) { foreach($terms as $t) {
if(strlen($x)) if(strlen($x))
$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>' : ''); . ((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)) if(strlen($x))
@ -978,7 +978,7 @@ function prepare_body($item,$attach = false) {
foreach($terms as $t) { foreach($terms as $t) {
if(strlen($x)) if(strlen($x))
$x .= '&nbsp;&nbsp;&nbsp;'; $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>'; . ' <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'])) if(strlen($x) && (local_user() == $item['uid']))