1 files changed, 7 insertions, 6 deletions
diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php
index 6184e2846..e4c6c86bb 100644
--- a/views/default/page/elements/topbar.php
+++ b/views/default/page/elements/topbar.php
@@ -1,15 +1,16 @@
 <?php
 /**
- * Elgg top toolbar
+ * Elgg topbar
  * The standard elgg top toolbar
  */
 
-
-
 // Elgg logo
-echo elgg_view_menu('topbar', array('sort_by' => 'weight'));
+echo elgg_view_menu('topbar', array('sort_by' => 'priority', array('elgg-menu-hz')));
 
 // elgg tools menu
 // need to echo this empty view for backward compatibility.
-// @todo -- do we really?  So much else is broken, and the new menu system is so much nicer...
-echo elgg_view("navigation/topbar_tools");
+$content = elgg_view("navigation/topbar_tools");
+if ($content) {
+	elgg_deprecated_notice('navigation/topbar_tools was deprecated. Extend the topbar menus or the page/elements/topbar view directly', 1.8);
+	echo $content;
+}