diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-02-13 17:48:14 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-02-13 17:48:14 +0000 |
| commit | 6b5efcb9f399746810e1ec74a9c4dc2e236d82a9 (patch) | |
| tree | 932fd6351e6fc52a2d74b06f2d62eb19c42042c2 /engine | |
| parent | d597cef86679c3924e07fc3074cd2e2fdaab8301 (diff) | |
| download | elgg-6b5efcb9f399746810e1ec74a9c4dc2e236d82a9.tar.gz elgg-6b5efcb9f399746810e1ec74a9c4dc2e236d82a9.tar.bz2 | |
Messages and exceptions, working merrily together. Aww.
git-svn-id: https://code.elgg.org/elgg/trunk@28 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/elgglib.php | 4 | ||||
| -rw-r--r-- | engine/start.php | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 7f98954a4..ab0bf8877 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -121,7 +121,7 @@ return elgg_view('pageshell', array(
'title' => $title,
'body' => $body,
- 'messages' => system_messages()
+ 'messages' => system_messages(null,"")
)
);
@@ -419,7 +419,7 @@ function __elgg_php_exception_handler($exception) {
$body = elgg_view("messages/exceptions/exception",array('object' => $exception));
- echo page_draw("Exception", $body);
+ echo page_draw("We've encountered a problem.", $body);
} 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.");
/**
|