summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Config.pm11
1 files changed, 11 insertions, 0 deletions
diff --git a/Bugzilla/Config.pm b/Bugzilla/Config.pm
index b1b0d6667..d84970e8c 100644
--- a/Bugzilla/Config.pm
+++ b/Bugzilla/Config.pm
@@ -318,6 +318,17 @@ sub read_param_file {
# Now read the param back out from the sandbox
%params = %{$s->varglob('param')};
}
+ elsif ($ENV{'SERVER_SOFTWARE'}) {
+ # We're in a CGI, but the params file doesn't exist. We can't
+ # Template Toolkit, or even install_string, since checksetup
+ # might not have thrown an error. Bugzilla::CGI->new
+ # hasn't even been called yet, so we manually use CGI::Carp here
+ # so that the user sees the error.
+ require CGI::Carp;
+ CGI::Carp->import('fatalsToBrowser');
+ die "The $datadir/params file does not exist."
+ . ' You probably need to run checksetup.pl.',
+ }
return \%params;
}