Bug 166698 - clean up the error system, which was confused and broken. Patch by gerv; r=bbaetz.

1 files changed, 2 insertions, 6 deletions

diff --git a/page.cgi b/page.cgi
index cc26f93db..2fcf1b9b7 100755
--- a/page.cgi
+++ b/page.cgi
@@ -39,19 +39,15 @@ ConnectToDatabase();
 
 quietly_check_login();
 
-print "Content-Type: text/html\n\n";
-
 if (defined $::FORM{'id'}) {
     $::FORM{'id'} =~ s/[^\w-]//g;
 
     if ($pages{$::FORM{'id'}}) {
+        print "Content-Type: text/html\n\n"; 
         $template->process($pages{$::FORM{'id'}}, $vars)
           || ThrowTemplateError($template->error());
         exit;
     }
 }
 
-$vars->{'message'} = "page_not_found";
-
-$template->process("global/message.html.tmpl", $vars)
-  || ThrowTemplateError($template->error());
+ThrowUserError("page_not_found");