1 files changed, 22 insertions, 29 deletions

diff --git a/mod/pages/index.php b/mod/pages/index.php
index 1d84587d5..2da53ed7b 100644
--- a/mod/pages/index.php
+++ b/mod/pages/index.php
@@ -5,46 +5,39 @@
  * @package ElggPages
  */
 
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+$guid = get_input('guid');
 
-global $CONFIG;
-
-// Add menus
+elgg_set_page_owner_guid($guid);
 $owner = elgg_get_page_owner();
-if (!($owner instanceof ElggGroup)) {
-		add_submenu_item(elgg_echo("pages:user", array(elgg_get_page_owner()->name)), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
-		add_submenu_item(elgg_echo('pages:all'), "mod/pages/world.php", 'pageslinksgeneral');
+if (!$owner) {
+
 }
-	if (($owner instanceof ElggEntity) && (can_write_to_container(0,$owner->guid))){
-		add_submenu_item(elgg_echo('pages:new'), "pg/pages/new/?container_guid=" . elgg_get_page_owner_guid(), 'pagesactions');
-		add_submenu_item(elgg_echo('pages:welcome'), "pg/pages/welcome/" . $owner->username, 'pagesactions');
-	}
 
 // access check for closed groups
 group_gatekeeper();
 
-$limit = get_input("limit", 10);
-$offset = get_input("offset", 0);
+$title = elgg_echo('pages:owner', array($owner->name));
 
-if($owner instanceof ElggGroup){
-	$title = elgg_echo("pages:group",array($owner->name));
-}else{
-	$title = elgg_echo("pages:user",array($owner->name));
-}
+elgg_push_breadcrumb($title);
 
+$content = elgg_list_entities(array(
+	'types' => 'object',
+	'subtypes' => 'page_top',
+	'container_guid' => elgg_get_page_owner_guid(),
+	'limit' => $limit,
+	'full_view' => false,
+));
 
-// Get objects
-elgg_push_context('search');
-$objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => elgg_get_page_owner_guid(), 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE));
-elgg_pop_context();
+$params = array(
+	'filter_context' => 'mine',
+	'content' => $content,
+	'title' => $title,
+);
 
-//get the owners latest welcome message
-$welcome_message = elgg_get_entities(array('types' => 'object', 'subtypes' => 'pages_welcome', 'container_guid' => $owner->guid, 'limit' => 1));
+if (elgg_instanceof($owner, 'group')) {
+	$params['filter'] = '';
+}
 
-$body = elgg_view_title($title);
-$body .= elgg_view("pages/welcome", array('entity' => $welcome_message));
-$body .= $objects;
-$body = elgg_view_layout('one_column_with_sidebar', array('content' => $body));
+$body = elgg_view_layout('content', $params);
 
-// Finally draw the page
 echo elgg_view_page($title, $body);