diff options
| -rw-r--r-- | mod/file/pages/file/owner.php | 4 | ||||
| -rw-r--r-- | mod/file/pages/file/world.php | 1 | ||||
| -rw-r--r-- | mod/file/views/default/file/sidebar.php | 9 | ||||
| -rw-r--r-- | mod/pages/pages/pages/owner.php | 5 | ||||
| -rw-r--r-- | mod/pages/pages/pages/world.php | 1 | ||||
| -rw-r--r-- | mod/pages/views/default/pages/sidebar.php | 9 | ||||
| -rw-r--r-- | views/default/page/elements/comments_block.php | 7 |
7 files changed, 31 insertions, 5 deletions
diff --git a/mod/file/pages/file/owner.php b/mod/file/pages/file/owner.php index 617e4c7f4..b7bfb00f8 100644 --- a/mod/file/pages/file/owner.php +++ b/mod/file/pages/file/owner.php @@ -56,9 +56,7 @@ if (!$content) { } $sidebar = file_get_type_cloud(elgg_get_page_owner_guid()); -if (elgg_instanceof($owner, 'user')) { - $sidebar .= elgg_view_latest_comments(elgg_get_page_owner_guid(), 'object', 'file'); -} +$sidebar = elgg_view('file/sidebar'); $params['content'] = $content; $params['title'] = $title; diff --git a/mod/file/pages/file/world.php b/mod/file/pages/file/world.php index a55dcb452..2cd942369 100644 --- a/mod/file/pages/file/world.php +++ b/mod/file/pages/file/world.php @@ -21,6 +21,7 @@ $content = elgg_list_entities(array( elgg_pop_context(); $sidebar = file_get_type_cloud(); +$sidebar = elgg_view('file/sidebar'); $body = elgg_view_layout('content', array( 'filter_context' => 'all', diff --git a/mod/file/views/default/file/sidebar.php b/mod/file/views/default/file/sidebar.php new file mode 100644 index 000000000..864965e98 --- /dev/null +++ b/mod/file/views/default/file/sidebar.php @@ -0,0 +1,9 @@ +<?php +/** + * File sidebar + */ + +echo elgg_view('page/elements/comments_block', array( + 'subtypes' => 'file', + 'owner_guid' => elgg_get_page_owner_guid(), +)); diff --git a/mod/pages/pages/pages/owner.php b/mod/pages/pages/pages/owner.php index 6a89e6092..c1169085f 100644 --- a/mod/pages/pages/pages/owner.php +++ b/mod/pages/pages/pages/owner.php @@ -33,11 +33,14 @@ if (elgg_get_page_owner_guid() == elgg_get_logged_in_user_guid()) { $filter_context = 'mine'; } +$sidebar = elgg_view('pages/sidebar/navigation'); +$sidebar .= elgg_view('pages/sidebar'); + $params = array( 'filter_context' => $filter_context, 'content' => $content, 'title' => $title, - 'sidebar' => elgg_view('pages/sidebar/navigation'), + 'sidebar' => $sidebar, ); if (elgg_instanceof($owner, 'group')) { diff --git a/mod/pages/pages/pages/world.php b/mod/pages/pages/pages/world.php index 668100ad2..267670144 100644 --- a/mod/pages/pages/pages/world.php +++ b/mod/pages/pages/pages/world.php @@ -23,6 +23,7 @@ $body = elgg_view_layout('content', array( 'filter_context' => 'all', 'content' => $content, 'title' => $title, + 'sidebar' => elgg_view('pages/sidebar'), )); echo elgg_view_page($title, $body); diff --git a/mod/pages/views/default/pages/sidebar.php b/mod/pages/views/default/pages/sidebar.php new file mode 100644 index 000000000..553335dc0 --- /dev/null +++ b/mod/pages/views/default/pages/sidebar.php @@ -0,0 +1,9 @@ +<?php +/** + * Pages sidebar + */ + +echo elgg_view('page/elements/comments_block', array( + 'subtypes' => array('page', 'page_top'), + 'owner_guid' => elgg_get_page_owner_guid(), +)); diff --git a/views/default/page/elements/comments_block.php b/views/default/page/elements/comments_block.php index 89e43b266..5571dc707 100644 --- a/views/default/page/elements/comments_block.php +++ b/views/default/page/elements/comments_block.php @@ -9,9 +9,14 @@ * @uses $vars['limit'] The number of comments to display */ +$owner_guid = elgg_extract('owner_guid', $vars, ELGG_ENTITIES_ANY_VALUE); +if (!$owner_guid) { + $owner_guid = ELGG_ENTITIES_ANY_VALUE; +} + $options = array( 'annotation_name' => 'generic_comment', - 'owner_guid' => elgg_extract('owner_guid', $vars, ELGG_ENTITIES_ANY_VALUE), + 'owner_guid' => $owner_guid, 'reverse_order_by' => true, 'limit' => elgg_extract('limit', $vars, 4), 'type' => 'object', |