1 files changed, 12 insertions, 9 deletions
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 8ba9fc298..e78289f28 100644
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -40,11 +40,13 @@ $editor = get_entity($annotation->owner_guid);
 $editor_link = elgg_view('output/url', array(
 	'href' => "pages/owner/$editor->username",
 	'text' => $editor->name,
+	'is_trusted' => true,
 ));
 
 $date = elgg_view_friendly_time($annotation->time_created);
 $editor_text = elgg_echo('pages:strapline', array($date, $editor_link));
 $tags = elgg_view('output/tags', array('tags' => $page->tags));
+$categories = elgg_view('output/categories', $vars);
 
 $comments_count = $page->countComments();
 //only display if there are commments
@@ -53,6 +55,7 @@ if ($comments_count != 0 && !$revision) {
 	$comments_link = elgg_view('output/url', array(
 		'href' => $page->getURL() . '#page-comments',
 		'text' => $text,
+		'is_trusted' => true,
 	));
 } else {
 	$comments_link = '';
@@ -65,7 +68,7 @@ $metadata = elgg_view_menu('entity', array(
 	'class' => 'elgg-menu-hz',
 ));
 
-$subtitle = "$editor_text $categories $comments_link";
+$subtitle = "$editor_text $comments_link $categories";
 
 // do not show the metadata and controls in widget view
 if (elgg_in_context('widgets') || $revision) {
@@ -77,20 +80,20 @@ if ($full) {
 
 	$params = array(
 		'entity' => $page,
-		'title' => false,
 		'metadata' => $metadata,
 		'subtitle' => $subtitle,
 		'tags' => $tags,
 	);
 	$params = $params + $vars;
-	$list_body = elgg_view('object/elements/summary', $params);
-
-	$info = elgg_view_image_block($page_icon, $list_body);
+	$summary = elgg_view('object/elements/summary', $params);
 
-	echo <<<HTML
-$info
-$body
-HTML;
+	echo elgg_view('object/elements/full', array(
+		'entity' => $page,
+		'title' => false,
+		'icon' => $page_icon,
+		'summary' => $summary,
+		'body' => $body,
+	));
 
 } else {
 	// brief view