Refs #2143 fix for commit [7354] as ampersands were being doubly encoded

git-svn-id: http://code.elgg.org/elgg/trunk@7391 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/output/url.php b/views/default/output/url.php
index 6e77a1984973221bff9b1cfa7674f445610aa339..8ea84d3d66057881e1b55d796f96f55f5dc75b50 100644 (file)
--- 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)) {\r
+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;
-\r
+
        $attributes = elgg_format_attributes($vars);
-       echo "<a $attributes>$text</a>";\r
+       echo "<a $attributes>$text</a>";
 }
\ No newline at end of file