diff options
Diffstat (limited to 'pages/entities')
| -rw-r--r-- | pages/entities/index.php | 16 | ||||
| -rw-r--r-- | pages/entities/list.php | 19 |
2 files changed, 6 insertions, 29 deletions
diff --git a/pages/entities/index.php b/pages/entities/index.php index 68018bfff..e73d65db4 100644 --- a/pages/entities/index.php +++ b/pages/entities/index.php @@ -5,12 +5,8 @@ * * @package Elgg * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ */ -// Load Elgg engine -require_once(dirname(dirname(__FILE__)) . "/engine/start.php"); // Get the GUID of the entity we want to view $guid = (int) get_input('guid'); @@ -23,15 +19,15 @@ if ($shell == "no") { $context = get_input('context'); if ($context) { - set_context($context); + elgg_set_context($context); } // Get the entity, if possible if ($entity = get_entity($guid)) { if ($entity->container_guid) { - set_page_owner($entity->container_guid); + elgg_set_page_owner_guid($entity->container_guid); } else { - set_page_owner($entity->owner_guid); + elgg_set_page_owner_guid($entity->owner_guid); } // Set the body to be the full view of the entity, and the title to be its title @@ -40,9 +36,9 @@ if ($entity = get_entity($guid)) { } else if ($entity instanceof ElggEntity) { $title = $entity->name; } - $area1 = elgg_view_entity($entity,true); + $area1 = elgg_view_entity($entity, array('full_view' => true)); if ($shell) { - $body = elgg_view_layout('one_column_with_sidebar', $area1); + $body = elgg_view_layout('one_column', array('content' => $area1)); } else { $body = $area1; } @@ -52,7 +48,7 @@ if ($entity = get_entity($guid)) { // Display the page if ($shell) { - page_draw($title, $body); + echo elgg_view_page($title, $body); } else { header("Content-type: text/html; charset=UTF-8"); echo $title; diff --git a/pages/entities/list.php b/pages/entities/list.php deleted file mode 100644 index 280336cef..000000000 --- a/pages/entities/list.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php -/** - * Entity viewer - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ - -require_once(dirname(dirname(__FILE__)) . "/engine/start.php"); - -set_context('search'); -$area2 = elgg_list_entities(); -set_context('entities'); - -$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2); - -page_draw("", $body);
\ No newline at end of file |