diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-03 17:53:05 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-03 17:53:05 +0000 |
| commit | 4766f36a4d74924f21ff329c4318ce4e069ffa04 (patch) | |
| tree | 969b84632f2a8b0db79788a8a6db8e41d63e5cb4 /views/default/output/url.php | |
| parent | 57a217fd6b708844407486046a1faa23b46cac08 (diff) | |
| download | elgg-4766f36a4d74924f21ff329c4318ce4e069ffa04.tar.gz elgg-4766f36a4d74924f21ff329c4318ce4e069ffa04.tar.bz2 | |
Pulled in the interface changes.
git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/output/url.php')
| -rw-r--r-- | views/default/output/url.php | 10 |
1 files changed, 3 insertions, 7 deletions
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 |