Fixed loading of activity and database files.

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

diff --git a/engine/start.php b/engine/start.php
index b7c63dfa4c3021dfa20a7e46504b518427f007c7..aa0f09904bd2eae89321e59e854407e2b0e7ac04 100644 (file)
--- 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'));
 }