1 files changed, 22 insertions, 29 deletions
diff --git a/index.php b/index.php
index 9f256c07e..708e38ec9 100644
--- a/index.php
+++ b/index.php
@@ -4,40 +4,33 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 /**
  * Start the Elgg engine
  */
-define('externalpage', TRUE);
 require_once(dirname(__FILE__) . "/engine/start.php");
 
-if (!trigger_plugin_hook('index', 'system', null, FALSE)) {
-	if (isloggedin()) {
-		forward('pg/dashboard/');
-	}
-
-	/*
-	River dashboard should respond to the index:system plugin hook instead of
-	being hard-coded here.
-	if(is_plugin_enabled('riverdashboard')){
-		$title = elgg_view_title(elgg_echo('content:latest'));
-		set_context('search');
-		$content = elgg_list_registered_entities(array('limit' => 10, 'full_view' => FALSE, 'allowed_types' => array('object','group')));
-		set_context('main');
-	}
-	*/
-	
-	//Load the front page
-	$title = elgg_view_title(elgg_echo('content:latest'));
-	set_context('search');
-	$offset = (int)get_input('offset', 0);
-	$content = elgg_list_registered_entities(array('limit' => 10, 'offset' => $offset, 'full_view' => FALSE, 'allowed_types' => array('object','group')));
-	set_context('main');
-	global $autofeed;
-	$autofeed = FALSE;
-	$content .= elgg_view_layout('one_column_with_sidebar', $title, elgg_view('account/forms/login'));
-	page_draw(null, $content);
+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 (elgg_is_logged_in()) {
+	forward('activity');
 }
+
+
+$content = elgg_view_title(elgg_echo('content:latest'));
+$content .= elgg_list_river();
+
+$login_box = elgg_view('core/account/login_box');
+
+$params = array(
+		'content' => $content,
+		'sidebar' => $login_box
+);
+$body = elgg_view_layout('one_sidebar', $params);
+echo elgg_view_page(null, $body);