Merge branch 'master' of github.com:Elgg/Elgg

3 files changed, 10 insertions, 7 deletions

diff --git a/views/default/page/elements/comments_block.php b/views/default/page/elements/comments_block.php
index 751aa4312..d0f8ab809 100644
--- a/views/default/page/elements/comments_block.php
+++ b/views/default/page/elements/comments_block.php
@@ -36,6 +36,7 @@ if ($comments) {
 		'items' => $comments,
 		'pagination' => false,
 		'list_class' => 'elgg-latest-comments',
+		'full_view' => false,
 	));
 } else {
 	$body = '<p>' . elgg_echo('generic_comment:none') . '</p>';
diff --git a/views/default/page/elements/header.php b/views/default/page/elements/header.php
index 2361644f2..1a1f5d211 100644
--- a/views/default/page/elements/header.php
+++ b/views/default/page/elements/header.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Elgg header contents
- * This file holds the header output that a user will see
- **/
+ * Elgg page header
+ * In the default theme, the header lives between the topbar and main content area.
+ */
 
 // link back to main site.
 echo elgg_view('page/elements/header_logo', $vars);
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;
+}