aboutsummaryrefslogtreecommitdiff
path: root/views/default/output/url.php
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-13 12:34:09 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-13 12:34:09 +0000
commit3b280cf0fdb3b08ab91a32e491f73bdb0ee2c96c (patch)
tree3bcb467ac265aa07078b6831da65a0a8973ef86b /views/default/output/url.php
parent0f15382843a749b3482722493ec74fba5d38e6e8 (diff)
downloadelgg-3b280cf0fdb3b08ab91a32e491f73bdb0ee2c96c.tar.gz
elgg-3b280cf0fdb3b08ab91a32e491f73bdb0ee2c96c.tar.bz2
Fixed #2218 finished up the encoding issues by turning of double encoding
git-svn-id: http://code.elgg.org/elgg/trunk@8199 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/output/url.php')
-rw-r--r--views/default/output/url.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/views/default/output/url.php b/views/default/output/url.php
index 4f34c120e..19277f08f 100644
--- a/views/default/output/url.php
+++ b/views/default/output/url.php
@@ -21,13 +21,13 @@ if (!$url and isset($vars['value'])) {
if (isset($vars['text'])) {
if (isset($vars['encode_text']) && $vars['encode_text']) {
- $text = htmlspecialchars($vars['text'], ENT_QUOTES, 'UTF-8');
+ $text = htmlspecialchars($vars['text'], ENT_QUOTES, 'UTF-8', false);
} else {
$text = $vars['text'];
}
unset($vars['text']);
} else {
- $text = htmlspecialchars($url, ENT_QUOTES, 'UTF-8');
+ $text = htmlspecialchars($url, ENT_QUOTES, 'UTF-8', false);
}
unset($vars['encode_text']);
@@ -36,7 +36,7 @@ if ($url) {
$url = elgg_normalize_url($url);
if (isset($vars['is_action'])) {
- $url = elgg_add_action_tokens_to_url($url, FALSE);
+ $url = elgg_add_action_tokens_to_url($url, false);
unset($vars['is_action']);
}