diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-05-02 12:40:38 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-05-02 12:40:38 +0000 |
| commit | 4cf87cd1f558593fe7047440806bc6b7d32e83ee (patch) | |
| tree | eff1ceef115a0977cfc8988f6ca88ae3afd455e7 /engine/start.php | |
| parent | db727a00f06d95da0b6d3a3356b1d60c01feabe3 (diff) | |
| download | elgg-4cf87cd1f558593fe7047440806bc6b7d32e83ee.tar.gz elgg-4cf87cd1f558593fe7047440806bc6b7d32e83ee.tar.bz2 | |
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
Diffstat (limited to 'engine/start.php')
| -rw-r--r-- | engine/start.php | 20 |
1 files changed, 11 insertions, 9 deletions
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 |