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/lib/elgglib.php | 4 ++-- engine/start.php | 19 ++++++++++--------- views/default/pageshell.php | 4 ++-- 3 files changed, 14 insertions(+), 13 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."); /** diff --git a/views/default/pageshell.php b/views/default/pageshell.php index eb10afc8e..e8631d83d 100644 --- a/views/default/pageshell.php +++ b/views/default/pageshell.php @@ -23,12 +23,12 @@ <?php echo $vars['title']; ?> +

'messages')); + echo elgg_view('messages/list', array('object' => $vars['messages'])); ?> -

\ No newline at end of file -- cgit v1.2.3