From 6b5efcb9f399746810e1ec74a9c4dc2e236d82a9 Mon Sep 17 00:00:00 2001 From: ben Date: Wed, 13 Feb 2008 17:48:14 +0000 Subject: Messages and exceptions, working merrily together. Aww. git-svn-id: https://code.elgg.org/elgg/trunk@28 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/start.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'engine/start.php') diff --git a/engine/start.php b/engine/start.php index 73a1e6b2d..5e9093fae 100644 --- a/engine/start.php +++ b/engine/start.php @@ -32,14 +32,6 @@ // Register the error handler set_error_handler('__elgg_php_error_handler'); set_exception_handler('__elgg_php_exception_handler'); - - /** - * Load the system settings - */ - - if (!@include_once(dirname(__FILE__) . "/settings.php")) { // Global settings - throw new InstallationException("Settings file is missing"); - } /** * If there are basic issues with the way the installation is formed, don't bother trying @@ -48,12 +40,21 @@ if (sanitised()) { // Begin portion for sanitised installs only + /** + * Load the system settings + */ + + 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("Could not load the main Elgg database library."); + throw new InstallationException("Elgg could not load the main Elgg database library."); /** -- cgit v1.2.3