diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-05-14 19:57:07 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-05-14 19:57:07 +0000 |
| commit | 4b1e3c8f7164bf1a31c14f23355c1adee8be0af2 (patch) | |
| tree | 065c7bf4ce6f7dab82b52bd60fac0f18c8a2b146 | |
| parent | 8e4a8d4d3c396c090256ae49c8b64ecc80f7ea89 (diff) | |
| download | elgg-4b1e3c8f7164bf1a31c14f23355c1adee8be0af2.tar.gz elgg-4b1e3c8f7164bf1a31c14f23355c1adee8be0af2.tar.bz2 | |
only display deprecation message if someone extends/overrides the deprecated tools view
git-svn-id: http://code.elgg.org/elgg/trunk@9080 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | views/default/navigation/topbar_tools.php | 1 | ||||
| -rw-r--r-- | views/default/page/elements/topbar.php | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/views/default/navigation/topbar_tools.php b/views/default/navigation/topbar_tools.php index 3351edc93..307f03fc6 100644 --- 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 17c5d938b..e4c6c86bb 100644 --- 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; +} |