Pulled in the interface changes.

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

4 files changed, 13 insertions, 20 deletions

diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php
index 3370320ed..9377426ad 100644
--- a/views/default/output/confirmlink.php
+++ b/views/default/output/confirmlink.php
@@ -20,7 +20,7 @@ if (!$confirm) {
 }
 
 // always generate missing action tokens
-$link = elgg_add_action_tokens_to_url($vars['href']);
+$link = elgg_validate_action_url($vars['href']);
 
 if (isset($vars['class']) && $vars['class']) {
 	$class = 'class="' . $vars['class'] . '"';
diff --git a/views/default/output/rss_view.php b/views/default/output/rss_view.php
new file mode 100755
index 000000000..0dd1002b4
--- /dev/null
+++ b/views/default/output/rss_view.php
@@ -0,0 +1,8 @@
+<?php
+	/**
+	 * View to display the RSS link
+	 **/
+?>
+<div class="sidebar_container">
+<p><a href=""><img src="<?php echo $vars['url']; ?>_graphics/icon_rss.gif" alt="RSS icon" /></a> RSS feed for the wire</p>
+</div>
\ No newline at end of file
diff --git a/views/default/output/tags.php b/views/default/output/tags.php
index b93536797..1afc89d88 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -29,17 +29,6 @@ if (empty($vars['tags']) && !empty($vars['value'])) {
 	$vars['tags'] = $vars['value'];
 }
 
-$tag_names_str = '';
-if (isset($vars['tag_names'])) {
-	if (is_array($vars['tag_names'])) {
-		foreach ($vars['tag_names'] as $tag_name) {
-			$tag_names_str .= "&tag_names[]=$tag_name";
-		}
-	} else {
-		$tag_names_str = "&tag_names={$vars['tag_names']}";
-	}
-}
-
 if (!empty($vars['tags'])) {
 	$tagstr = "";
 	if (!is_array($vars['tags'])) {
@@ -56,7 +45,7 @@ if (!empty($vars['tags'])) {
 			$type = "";
 		}
 		if (is_string($tag)) {
-			$tagstr .= "<a rel=\"tag\" href=\"{$vars['url']}pg/search/?q=".urlencode($tag) . "&search_type=tags{$type}{$subtype}{$object}{$tag_names_str}\">" . htmlentities($tag, ENT_QUOTES, 'UTF-8') . "</a>";
+			$tagstr .= "<a rel=\"tag\" href=\"{$vars['url']}pg/search/?q=".urlencode($tag) . "&search_type=tags{$type}{$subtype}{$object}\">" . htmlentities($tag, ENT_QUOTES, 'UTF-8') . "</a>";
 		}
 	}
 	echo $tagstr;
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