only display deprecation message if someone extends/overrides the deprecated tools...

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

diff --git a/views/default/navigation/topbar_tools.php b/views/default/navigation/topbar_tools.php
index 3351edc93cf4ff9bfdd7b2921f5b93a20d13e2f9..307f03fc65d3153caf656f7175b1e7915b0efd97 100644 (file)
--- a/views/default/navigation/topbar_tools.php
+++ b/views/default/navigation/topbar_tools.php
@@ -7,4 +7,3 @@
  * 
  * @deprecated 1.8 Extend the topbar menus or the page/elements/topbar view directly
  */
-elgg_deprecated_notice('navigation/topbar_tools was deprecated. Extend the topbar menus or the page/elements/topbar view directly', 1.8);
\ No newline at end of file

diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php
index 17c5d938b8b813d5c0a0343154380e7f16f7df5c..e4c6c86bb8492839b6abcc1ae63a7ff7dfd0b805 100644 (file)
--- a/views/default/page/elements/topbar.php
+++ b/views/default/page/elements/topbar.php
@@ -1,14 +1,16 @@
 <?php
 /**
- * Elgg top toolbar
+ * Elgg topbar
  * The standard elgg top toolbar
  */
 
-
-
 // Elgg logo
 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.
-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;
+}