3 files changed, 45 insertions, 1 deletions
diff --git a/views/default/output/location.php b/views/default/output/location.php
new file mode 100644
index 000000000..e3619d2e1
--- /dev/null
+++ b/views/default/output/location.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Display a location
+ *
+ * @uses $vars['entity'] The ElggEntity that has a location
+ * @uses $vars['value']  The location string if the entity is not passed
+ */
+
+if (isset($vars['entity'])) {
+	$vars['value'] = $vars['entity']->location;
+	unset($vars['entity']);
+}
+
+echo elgg_view('output/tag', $vars);
diff --git a/views/default/output/tag.php b/views/default/output/tag.php
new file mode 100644
index 000000000..abae9c4b2
--- /dev/null
+++ b/views/default/output/tag.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Elgg single tag output
+ *
+ * @uses $vars['value']   String
+ * @uses $vars['type']    The entity type, optional
+ * @uses $vars['subtype'] The entity subtype, optional
+ *
+ */
+
+if (!empty($vars['subtype'])) {
+	$subtype = "&subtype=" . urlencode($vars['subtype']);
+} else {
+	$subtype = "";
+}
+if (!empty($vars['object'])) {
+	$object = "&object=" . urlencode($vars['object']);
+} else {
+	$object = "";
+}
+
+if (isset($vars['value'])) {
+	if (!empty($vars['type'])) {
+		$type = "&type={$vars['type']}";
+	} else {
+		$type = "";
+	}
+	$url = elgg_get_site_url() . 'search?q=' . urlencode($vars['value']) . "&search_type=tags{$type}{$subtype}{$object}";
+	echo elgg_view('output/url', array('href' => $url, 'text' => $vars['value'], 'rel' => 'tag'));
+}
diff --git a/views/default/output/tags.php b/views/default/output/tags.php
index 57cb21ea7..6dedfacc7 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -10,7 +10,7 @@
  */
 
 if (isset($vars['entity'])) {
-	$defaults['value'] = $vars['entity']->tags;
+	$vars['tags'] = $vars['entity']->tags;
 	unset($vars['entity']);
 }