Upgraded to Elgg 1.8.6.

Merge tag '1.8.6' of git://github.com/Elgg/Elgg into lorea-preprod

Elgg 1.8.6 release

2 files changed, 11 insertions, 2 deletions

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'];
 }
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>";
 	}
 }