Refs #2895: Converted page_links into a menu. Bookmarks now uses it

git-svn-id: http://code.elgg.org/elgg/trunk@8474 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 1 insertions, 38 deletions

diff --git a/views/default/page/elements/page_links.php b/views/default/page/elements/page_links.php
deleted file mode 100644
index bd901ee42..000000000
--- a/views/default/page/elements/page_links.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Page links: RSS link, reported content link, etc.
- */
-
-// Are there feeds to display?
-global $autofeed;
-$rss_link = '';
-if (isset($autofeed) && $autofeed == true) {
-	$url = full_url();
-	if (substr_count($url,'?')) {
-		$url .= "&view=rss";
-	} else {
-		$url .= "?view=rss";
-	}
-	$url = elgg_format_url($url);
-	$label = elgg_echo('feed:rss');
-	
-	$rss_link = elgg_view('output/url', array(
-		'text' => elgg_view_icon('rss'),
-		'href' => $url,
-		'title' => $label,
-		'rel' => 'nofollow',
-		'encode_text' => false,
-		'class' => 'right',
-	));
-}
-
-// view to extend by plugins
-$links = elgg_view('page/links', $vars);
-
-if ($links || $rss_link) {
-	echo '<div class="elgg-page-links clearfix mbm">';
-	echo $rss_link;
-	echo $links;
-	echo '</div>';
-}
diff --git a/views/default/page/elements/sidebar.php b/views/default/page/elements/sidebar.php
index 8950c5f3f..95ff7308e 100644
--- a/views/default/page/elements/sidebar.php
+++ b/views/default/page/elements/sidebar.php
@@ -5,7 +5,7 @@
  * @uses $vars['sidebar'] Optional content that is displayed at the bottom of sidebar
  */
 
-echo elgg_view('page/elements/page_links', $vars);
+echo elgg_view_menu('page_links', array('sort_by' => 'name'));
 
 echo elgg_view('page/elements/owner_block', $vars);