Pulling in MORE changes that weren't in the patch. Apparently I fail at patching.

git-svn-id: http://code.elgg.org/elgg/trunk@5265 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 13 insertions, 12 deletions

diff --git a/index.php b/index.php
index 0fa5526d7..f289fe20b 100644
--- a/index.php
+++ b/index.php
@@ -11,26 +11,27 @@
 /**
  * Start the Elgg engine
  */
-define('externalpage',true);
+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 = elgg_list_registered_entities(array('limit' => 10, 'full_view' => FALSE, 'allowed_types' => array('object','group')));
-	set_context('main');
+	/*
+	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');
+	}
+	*/
+	
 	global $autofeed;
 	$autofeed = FALSE;
-	$content = elgg_view_layout('two_column_left_sidebar', '', $title . $content, elgg_view("account/forms/login"));
+	$content = elgg_view_layout('one_column_with_sidebar', elgg_view('account/forms/login'), $title . $content);
 	page_draw(null, $content);
 }