From 81dac97890197658e5446e464604c2bc15903e5a Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Fri, 15 Jun 2012 22:28:46 -0400
Subject: Fixes #4582 using output/url for links in pagination

---
 views/default/navigation/pagination.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'views/default/navigation')

diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index e0d355327..04044c51c 100644
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -113,7 +113,12 @@ foreach ($pages->items as $page) {
 	} else {
 		$page_offset = (($page - 1) * $limit);
 		$url = elgg_http_add_url_query_elements($base_url, array($offset_key => $page_offset));
-		echo "<li><a href=\"$url\">$page</a></li>";
+		$link = elgg_view('output/url', array(
+			'href' => $url,
+			'text' => $page,
+			'is_trusted' => true,
+		));
+		echo "<li>$link</li>";
 	}
 }
 
-- 
cgit v1.2.3


From b6daeeff44535de77f81396d6690f6eedbf57708 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 16 Jun 2012 13:16:21 -0400
Subject: Fixes #4502 selected menu items maintain plugin provided classes

---
 views/default/navigation/menu/elements/item.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'views/default/navigation')

diff --git a/views/default/navigation/menu/elements/item.php b/views/default/navigation/menu/elements/item.php
index 22383ce0b..fd9738826 100644
--- a/views/default/navigation/menu/elements/item.php
+++ b/views/default/navigation/menu/elements/item.php
@@ -13,7 +13,8 @@ $item = $vars['item'];
 
 $link_class = 'elgg-menu-closed';
 if ($item->getSelected()) {
-	$item->setItemClass('elgg-state-selected');
+	// @todo switch to addItemClass when that is implemented
+	//$item->setItemClass('elgg-state-selected');
 	$link_class = 'elgg-menu-opened';
 }
 
@@ -24,6 +25,9 @@ if ($children) {
 }
 
 $item_class = $item->getItemClass();
+if ($item->getSelected()) {
+	$item_class = "$item_class elgg-state-selected";
+}
 if (isset($vars['item_class']) && $vars['item_class']) {
 	$item_class .= ' ' . $vars['item_class'];
 }
-- 
cgit v1.2.3