1 files changed, 22 insertions, 22 deletions
diff --git a/index.php b/index.php
index b6df6b3c1..708e38ec9 100644
--- a/index.php
+++ b/index.php
@@ -4,33 +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)) {
-	/**
-	 * Check to see if user is logged in, if not display login form
-	 **/
-
-	if (isloggedin()) {
-		forward('pg/dashboard/');
-	}
-
-	//Load the front page
-	global $CONFIG;
-	$title = elgg_view_title(elgg_echo('content:latest'));
-	set_context('search');
-	$content = list_registered_entities(0,10,false,false,array('object','group'));
-	set_context('main');
-	global $autofeed;
-	$autofeed = false;
-	$content = elgg_view_layout('two_column_left_sidebar', '', $title . $content, 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);