aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-10 12:40:02 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-10 12:40:02 +0000
commite1c54733c388ef0f75d6288c7add7d381e583ac5 (patch)
treede0161810fe6458ceca78f9849aa95193c21e94c /engine/lib
parent60973c259b643f92f96fadf2effc1f37dd930898 (diff)
downloadelgg-e1c54733c388ef0f75d6288c7add7d381e583ac5.tar.gz
elgg-e1c54733c388ef0f75d6288c7add7d381e583ac5.tar.bz2
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
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/elgglib.php3
-rw-r--r--engine/lib/install.php3
2 files changed, 3 insertions, 3 deletions
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'));
}
}