diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/plugins.php | 2 | ||||
| -rw-r--r-- | engine/start.php | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php index a5027486d..34be9b7cf 100644 --- a/engine/lib/plugins.php +++ b/engine/lib/plugins.php @@ -19,7 +19,7 @@ * @todo Add proper plugin handler that launches plugins in an admin-defined order and activates them on admin request
*/
function load_plugins() {
-
+
global $CONFIG;
if (!empty($CONFIG->pluginspath)) {
diff --git a/engine/start.php b/engine/start.php index 1ed294a03..68f43bc74 100644 --- a/engine/start.php +++ b/engine/start.php @@ -46,15 +46,13 @@ if (!@include_once(dirname(__FILE__) . "/settings.php")) // Global settings
throw new InstallationException("Elgg could not load the settings file.");
-
-
+
/**
* Load and initialise the database
*/
if (!@include_once(dirname(__FILE__) . "/lib/database.php")) // Database connection
throw new InstallationException("Elgg could not load the main Elgg database library.");
-
/**
* Load the remaining libraries from /lib/ in alphabetical order,
@@ -82,6 +80,9 @@ throw new InstallationException("Could not load {$file}");
}
+ // Set default config
+ set_default_config();
+
// Load plugins
load_plugins();
|