From c0c5c0f81f40b5d72048e74842a650f974cefcd7 Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Tue, 1 May 2012 17:15:42 -0700
Subject: Fixes #1835. Passing tagcloud URLs through output/url for proper
 escaping.

---
 views/default/output/tagcloud.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'views/default')

diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index 22b6cf49d..a212becd8 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -47,9 +47,15 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
 		if ($size < 100) {
 			$size = 100;
 		}
-		$url = elgg_get_site_url()."search?q=". urlencode($tag->tag) . "&search_type=tags$type$subtype";
-		$url = elgg_format_url($url);
-		$cloud .= "<a href=\"$url\" style=\"font-size: $size%\" title=\"".addslashes($tag->tag)." ($tag->total)\">" . htmlspecialchars($tag->tag, ENT_QUOTES, 'UTF-8') . "</a>";
+		$url = "search?q=". urlencode($tag->tag) . "&search_type=tags$type$subtype";
+
+		$cloud .= elgg_view('output/url', array(
+			'text' => $tag->tag,
+			'href' => $url,
+			'style' => "font-size: $size%;",
+			'title' => "$tag->tag ($tag->total)",
+			'rel' => 'tag'
+		));
 	}
 	
 	$cloud .= elgg_view('tagcloud/extend');
-- 
cgit v1.2.3


From 13a6de000d9b0959c9302f1d058b01d7cb7c0735 Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Wed, 9 May 2012 22:00:21 -0300
Subject: Fixes #4509: Remove invalid space in id attribute markup

---
 views/default/page/elements/comments.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'views/default')

diff --git a/views/default/page/elements/comments.php b/views/default/page/elements/comments.php
index ebc7d3df5..cf9b5f08b 100644
--- a/views/default/page/elements/comments.php
+++ b/views/default/page/elements/comments.php
@@ -12,7 +12,7 @@ $show_add_form = elgg_extract('show_add_form', $vars, true);
 
 $id = '';
 if (isset($vars['id'])) {
-	$id = "id =\"{$vars['id']}\"";
+	$id = "id=\"{$vars['id']}\"";
 }
 
 $class = 'elgg-comments';
-- 
cgit v1.2.3


From 3d5db88999fbafa1d1ac6f0dedf01d692c2a968c Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Thu, 10 May 2012 10:31:11 -0700
Subject: Fixes #4372. Using elgg_view_friendly_time() in river entries.

---
 CHANGES.txt                           | 4 ++++
 views/default/river/elements/body.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'views/default')

diff --git a/CHANGES.txt b/CHANGES.txt
index cabfd604b..2a3339c95 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,10 @@ Version 1.8.5
                   an account with Twitter.
    * Files: PDF files are downloaded as "inline" to display in the browser.
 
+ API:
+   * River entries' timestamps use elgg_view_friendly_time() and can be 
+     overridden with the friendly time output view.
+
 Version 1.8.4
 (April 24, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
 
diff --git a/views/default/river/elements/body.php b/views/default/river/elements/body.php
index 6894b81e2..2cd7f2289 100644
--- a/views/default/river/elements/body.php
+++ b/views/default/river/elements/body.php
@@ -18,7 +18,7 @@ $menu = elgg_view_menu('river', array(
 ));
 
 // river item header
-$timestamp = elgg_get_friendly_time($item->getPostedTime());
+$timestamp = elgg_view_friendly_time($item->getPostedTime());
 
 $summary = elgg_extract('summary', $vars, elgg_view('river/elements/summary', array('item' => $vars['item'])));
 if ($summary === false) {
-- 
cgit v1.2.3