aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--views/default/output/url.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/views/default/output/url.php b/views/default/output/url.php
index 6e77a1984..8ea84d3d6 100644
--- a/views/default/output/url.php
+++ b/views/default/output/url.php
@@ -7,6 +7,7 @@
* @subpackage Core
*
* @uses string $vars['text'] The string between the <a></a> tags.
+ * @uses string $vars['href'] The unencoded url string
* @uses bool $vars['encode_text'] Run $vars['text'] through htmlspecialchars()?
* @uses bool $vars['is_action'] Is this a link to an action?
*
@@ -18,7 +19,7 @@ if (!$url and isset($vars['value'])) {
unset($vars['value']);
}
-if (!empty($url)) {
+if (!empty($url)) {
if (isset($vars['text'])) {
if (isset($vars['encode_text']) && $vars['encode_text']) {
$text = htmlspecialchars($vars['text'], ENT_QUOTES, 'UTF-8');
@@ -36,12 +37,12 @@ if (!empty($url)) {
$url = elgg_normalize_url($url);
if (isset($vars['is_action'])) {
- $url = elgg_add_action_tokens_to_url($url);
+ $url = elgg_add_action_tokens_to_url($url, FALSE);
unset($vars['is_action']);
}
$vars['href'] = $url;
-
+
$attributes = elgg_format_attributes($vars);
- echo "<a $attributes>$text</a>";
+ echo "<a $attributes>$text</a>";
} \ No newline at end of file