aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-14 20:58:17 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-14 20:58:17 +0000
commit0758e7a4f1e791cc5e9bc80dc2ada2747296eac2 (patch)
treea5b74b91fe443b2e31a26972abc667090c242309
parent0c2c36ff3b0329ff849930d0403f933653a84dcd (diff)
downloadelgg-0758e7a4f1e791cc5e9bc80dc2ada2747296eac2.tar.gz
elgg-0758e7a4f1e791cc5e9bc80dc2ada2747296eac2.tar.bz2
Fixed loading of activity and database files.
git-svn-id: http://code.elgg.org/elgg/trunk@6060 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/start.php17
1 files changed, 12 insertions, 5 deletions
diff --git a/engine/start.php b/engine/start.php
index b7c63dfa4..aa0f09904 100644
--- a/engine/start.php
+++ b/engine/start.php
@@ -50,9 +50,21 @@ set_exception_handler('__elgg_php_exception_handler');
// attempt to save settings.php and .htaccess if in installation.
if ($sanitised = sanitised()) {
+ /**
+ * Load the system settings
+ */
+ if (!include_once(dirname(__FILE__) . "/settings.php")) {
+ throw new InstallationException("Elgg could not load the settings file.");
+ }
+
+ // Get config
+ global $CONFIG;
// load the rest of the library files from engine/lib/
$lib_files = array(
+ // these want to be loaded first apparently?
+ 'database.php', 'actions.php',
+
'admin.php', 'annotations.php', 'api.php', 'cache.php',
'calendar.php', 'configuration.php', 'cron.php', 'entities.php',
'export.php', 'extender.php', 'filestore.php', 'group.php',
@@ -72,11 +84,6 @@ if ($sanitised = sanitised()) {
throw new InstallationException("Could not load {$file}");
}
}
-
- // Load system settings
- if (!include_once(dirname(__FILE__) . "/settings.php")) {
- throw new InstallationException("Elgg could not load the settings file.");
- }
} else {
throw new InstallationException(elgg_echo('installation:error:configuration'));
}