From 4766f36a4d74924f21ff329c4318ce4e069ffa04 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 3 Mar 2010 17:53:05 +0000
Subject: Pulled in the interface changes.

git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/output/url.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'views/default/output/url.php')

diff --git a/views/default/output/url.php b/views/default/output/url.php
index 7319f6971..b77ffbf00 100644
--- a/views/default/output/url.php
+++ b/views/default/output/url.php
@@ -17,15 +17,11 @@
  *
  */
 
-if (isset($vars['value'])) {
-	$vars['href'] = $vars['value'];
-}
-
 $url = trim($vars['href']);
 
 if (!empty($url)) {
 	if (array_key_exists('is_action', $vars) && $vars['is_action']) {
-		$url = elgg_add_action_tokens_to_url($url);
+		$url = elgg_validate_action_url($url);
 	}
 
 	if (array_key_exists('target', $vars) && $vars['target']) {
@@ -41,7 +37,7 @@ if (!empty($url)) {
 	}
 
 	if (array_key_exists('js', $vars) && $vars['js']) {
-		$js = "{$vars['js']}";
+		$js = "{$vars['target']}";
 	} else {
 		$js = '';
 	}
@@ -53,4 +49,4 @@ if (!empty($url)) {
 	}
 
 	echo "<a href=\"{$url}\" $target $class $js>$text</a>";
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3