diff --git a/models/ErrorHandler.php b/models/ErrorHandler.php index 4ce560a5..254291a0 100644 --- a/models/ErrorHandler.php +++ b/models/ErrorHandler.php @@ -131,7 +131,7 @@ class ErrorHandler ])) { header('HTTP/1.1 503 Service Temporarily Unavailable'); - echo '
Our software could not connect to the database. We apologise for any inconvenience and ask you to check back later.
'; + echo 'Our software could not connect to the database. We apologise for any inconvenience and ask you to check back later.
'; exit; } @@ -156,18 +156,18 @@ class ErrorHandler elseif (!$is_sensitive) echo json_encode(['error' => $message]); else - echo json_encode(['error' => 'Our apologies, an error occured while we were processing your request. Please try again later, or contact us if the problem persists.']); + echo json_encode(['error' => 'Our apologies, an error occurred while we were processing your request. Please try again later, or contact us if the problem persists.']); exit; } // Initialise the main template to present a nice message to the user. - $page = new MainTemplate('An error occured!'); + $page = new MainTemplate('An error occurred!'); // Show the error. $is_admin = Registry::has('user') && Registry::get('user')->isAdmin(); if (DEBUG || $is_admin) { - $page->adopt(new DummyBox('An error occured!', '' . $message . '
' . $debug_info . '')); + $page->adopt(new DummyBox('An error occurred!', '
' . $message . '
' . $debug_info . '')); // Let's provide the admin navigation despite it all! if ($is_admin) @@ -176,9 +176,9 @@ class ErrorHandler } } elseif (!$is_sensitive) - $page->adopt(new DummyBox('An error occured!', '
' . $message . '
')); + $page->adopt(new DummyBox('An error occurred!', '' . $message . '
')); else - $page->adopt(new DummyBox('An error occured!', 'Our apologies, an error occured while we were processing your request. Please try again later, or contact us if the problem persists.
')); + $page->adopt(new DummyBox('An error occurred!', 'Our apologies, an error occurred while we were processing your request. Please try again later, or contact us if the problem persists.
')); // If we got this far, make sure we're not showing stuff twice. ob_end_clean();