1 files changed, 7 insertions, 20 deletions

diff --git a/index.php b/index.php
index 33f51cb9b..708e38ec9 100644
--- a/index.php
+++ b/index.php
@@ -11,39 +11,26 @@
  */
 require_once(dirname(__FILE__) . "/engine/start.php");
 
+elgg_set_context('main');
+
 // allow plugins to override the front page (return true to stop this front page code)
 if (elgg_trigger_plugin_hook('index', 'system', null, FALSE) != FALSE) {
 	exit;
 }
 
-if (isloggedin()) {
-	forward('pg/activity/');
+if (elgg_is_logged_in()) {
+	forward('activity');
 }
 
-//Load the front page
-$title = elgg_view_title(elgg_echo('content:latest'));
-elgg_set_context('search');
-$offset = (int)get_input('offset', 0);
-$options = array(
-		'limit' => 10,
-		'offset' => $offset,
-		'full_view' => FALSE,
-		'allowed_types' => array('object','group')
-);
-
-$activity = elgg_list_registered_entities($options);
-elgg_set_context('main');
 
-global $autofeed;
-$autofeed = FALSE;
+$content = elgg_view_title(elgg_echo('content:latest'));
+$content .= elgg_list_river();
 
-// if drop-down login in header option not selected
 $login_box = elgg_view('core/account/login_box');
 
-$content = $title . $activity;
 $params = array(
 		'content' => $content,
 		'sidebar' => $login_box
 );
-$body = elgg_view_layout('one_column_with_sidebar', $params);
+$body = elgg_view_layout('one_sidebar', $params);
 echo elgg_view_page(null, $body);