aboutsummaryrefslogtreecommitdiff
path: root/index.php
diff options
context:
space:
mode:
authorMaZderMind2016-12-10 18:27:07 +0100
committerMaZderMind2016-12-10 18:27:07 +0100
commit0c3fca54cfce9c595f713b0e0d62e1300ca05045 (patch)
tree2c29f08a379f66d6773f528a06af5f1f37cbe49a /index.php
parent51ee8234fa7d8c2fbda0705563ab724746dfe9ce (diff)
parent751c58ebf7e8e6ea20b5f5116866f065e52ea1a2 (diff)
Merge branch 'cleanups'
Diffstat (limited to '')
-rw-r--r--index.php21
1 files changed, 15 insertions, 6 deletions
diff --git a/index.php b/index.php
index 19a174a..414dede 100644
--- a/index.php
+++ b/index.php
@@ -140,7 +140,16 @@ try {
catch(Exception $e)
{
ob_clean();
- require('view/500.php');
+ try {
+ require('view/500.php');
+ exit;
+ }
+ catch(Exception $e) {
+ header("HTTP/1.1 500 Internal Server Error");
+ header("Content-Type: text/plain");
+ print_r($e);
+ exit;
+ }
}
@@ -205,6 +214,11 @@ try {
require('view/multiview.php');
}
+ else if($route == 'about')
+ {
+ require('view/about.php');
+ }
+
// HAS-NOT-BEGUN VIEW
else if(!$conference->hasBegun())
{
@@ -238,11 +252,6 @@ try {
require('view/overview.php');
}
- else if($route == 'about')
- {
- require('view/about.php');
- }
-
else if($route == 'feedback')
{
require('view/feedback.php');