Merge branch 'master' of github.com:Elgg/Elgg

4 files changed, 58 insertions, 8 deletions

diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php
index 967094113..5059a656e 100644
--- a/views/default/output/confirmlink.php
+++ b/views/default/output/confirmlink.php
@@ -13,7 +13,8 @@
  * @uses $vars['text_encode'] Encode special characters? (false)
  */
 
-$confirm = elgg_extract('confirm', $vars, elgg_echo('question:areyousure'));
+$vars['rel'] = elgg_extract('confirm', $vars, elgg_echo('question:areyousure'));
+$vars['rel'] = addslashes($vars['rel']);
 $encode = elgg_extract('text_encode', $vars, false);
 
 // always generate missing action tokens
@@ -36,7 +37,6 @@ if (isset($vars['class'])) {
 } else {
 	$vars['class'] = 'elgg-requires-confirmation';
 }
-//$vars['onclick'] = "return confirm('" . addslashes($confirm) . "')";
 
 unset($vars['encode_text']);
 unset($vars['text']);
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 345b256c4..6dedfacc7 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -1,17 +1,19 @@
 <?php
 /**
  * Elgg tags
- *
  * Tags can be a single string (for one tag) or an array of strings
  *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['tags'] The tags to display
- * @uses $vars['type'] The entity type, optional
+ * @uses $vars['value']   Array of tags or a string
+ * @uses $vars['type']    The entity type, optional
  * @uses $vars['subtype'] The entity subtype, optional
+ * @uses $vars['entity']  Optional. Entity whose tags are being displayed (metadata ->tags)
  */
 
+if (isset($vars['entity'])) {
+	$vars['tags'] = $vars['entity']->tags;
+	unset($vars['entity']);
+}
+
 if (!empty($vars['subtype'])) {
 	$subtype = "&subtype=" . urlencode($vars['subtype']);
 } else {
@@ -27,6 +29,10 @@ if (empty($vars['tags']) && !empty($vars['value'])) {
 	$vars['tags'] = $vars['value'];
 }
 
+if (empty($vars['tags']) && isset($vars['entity'])) {
+	$vars['tags'] = $vars['entity']->tags;
+}
+
 if (!empty($vars['tags'])) {
 	if (!is_array($vars['tags'])) {
 		$vars['tags'] = array($vars['tags']);