From 4cf87cd1f558593fe7047440806bc6b7d32e83ee Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 2 May 2008 12:40:38 +0000
Subject: The system now uses the site GUID to get and set entity data. Also,
 installation is a great deal more visual.

git-svn-id: https://code.elgg.org/elgg/trunk@621 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/start.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'engine/start.php')

diff --git a/engine/start.php b/engine/start.php
index 87b8cfb1b..6c85ce75c 100644
--- a/engine/start.php
+++ b/engine/start.php
@@ -15,12 +15,11 @@
 	/**
 	 * Load important prerequisites
 	 */
-
+		
 		if (!@include_once(dirname(__FILE__) . "/lib/exceptions.php")) {		// Exceptions 
 			echo "Error in installation: could not load the Exceptions library.";
 			exit;
 		}
-
 		if (!@include_once(dirname(__FILE__) . "/lib/elgglib.php")) {		// Main Elgg library
 			throw new InstallationException("Elgg could not load its main library.");
 		}
@@ -106,20 +105,23 @@
 			
 		}
 		
-		// Autodetect some default configuration settings
-			set_default_config();
-		
 		// Trigger events
 			trigger_event('boot', 'system');
-			
 		// Forward if we haven't been installed
 			if ((!is_installed() || !is_db_installed()) && !substr_count($_SERVER["PHP_SELF"],"install.php")) {
-				forward("install.php");
+				// Autodetect some default configuration settings
+					set_default_config();
+					forward("install.php");
 			}
-			
+
 		// Trigger events
-			if (!substr_count($_SERVER["PHP_SELF"],"install.php")) {
+			if (!substr_count($_SERVER["PHP_SELF"],"install.php") &&
+				!substr_count($_SERVER["PHP_SELF"],"setup.php")) {
+				// If default settings haven't been installed, forward to the default settings page
 				trigger_event('init', 'system');
+				if (!datalist_get('default_settings')) {
+					//forward("setup.php");
+				}
 			}
 
 ?>
\ No newline at end of file
-- 
cgit v1.2.3