From e1c54733c388ef0f75d6288c7add7d381e583ac5 Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 10 Oct 2010 12:40:02 +0000 Subject: handling the database being down/busy or an incomplete install. Also cleaned up failsafe views git-svn-id: http://code.elgg.org/elgg/trunk@7044 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/elgglib.php | 3 ++- engine/lib/install.php | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'engine') diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 16e20ef7c..4376ca53f 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -1401,9 +1401,10 @@ function __elgg_php_exception_handler($exception) { // make sure the error isn't cached header("Cache-Control: no-cache, must-revalidate", true); header('Expires: Fri, 05 Feb 1982 00:00:00 -0500', true); - // @todo Why don't we send a 500 header? + // @note Do not send a 500 header because it is not a server error //header("Internal Server Error", true, 500); + elgg_set_viewtype('failsafe'); $body = elgg_view("messages/exceptions/exception", array('object' => $exception)); page_draw(elgg_echo('exception:title'), $body); } diff --git a/engine/lib/install.php b/engine/lib/install.php index 9deec9e26..f36b528da 100644 --- a/engine/lib/install.php +++ b/engine/lib/install.php @@ -53,7 +53,6 @@ function verify_installation() { $installed = is_installed(); } catch (DatabaseException $e) {} if (!$installed) { - header("Location: install.php"); - exit; + throw new InstallationException(elgg_echo('InstallationException:SiteNotInstalled')); } } -- cgit v1.2.3