merging 7.4 changes

This commit is contained in:
Graham Knop 2008-01-23 23:48:35 +00:00
parent 5292426cc5
commit 1149fd54ed
19 changed files with 319 additions and 167 deletions

View file

@ -19,6 +19,7 @@ use strict;
use Log::Log4perl;
use Apache2::RequestUtil;
use JSON;
use HTML::Entities;
=head1 NAME
@ -215,7 +216,7 @@ sub fatal {
elsif ($self->canShowDebug()) {
$self->session->output->print("<h1>WebGUI Fatal Error</h1><p>Something unexpected happened that caused this system to fault.</p>\n",1);
$self->session->output->print("<p>".$message."</p>\n",1);
$self->session->output->print($self->getStackTrace(), 1);
$self->session->output->print("<pre>" . encode_entities($self->getStackTrace) . "</pre>", 1);
$self->session->output->print($self->showDebug(),1);
}
else {
@ -228,7 +229,7 @@ sub fatal {
$self->session->output->print('<br />'.$self->session->setting->get("companyURL"),1);
}
$self->session->close();
exit;
die "fatal: " . $message;
}