diff options
| author | lpsolit%gmail.com <> | 2006-06-20 05:15:17 +0200 |
|---|---|---|
| committer | lpsolit%gmail.com <> | 2006-06-20 05:15:17 +0200 |
| commit | 2545c0950c4f0fde8f78b265217fa9f523eff7bf (patch) | |
| tree | 5bb305644ad11da196c7613b82743e426e2fd337 /Bugzilla/Error.pm | |
| parent | b687ddef9b6dfeec3d87b7ae211decbf21b6e9a9 (diff) | |
| download | bugzilla-2545c0950c4f0fde8f78b265217fa9f523eff7bf.tar.gz bugzilla-2545c0950c4f0fde8f78b265217fa9f523eff7bf.tar.xz | |
Bug 304601: Bugzilla::Config's :locations exports need to be in their own module - Patch by Frédéric Buclin <LpSolit@gmail.com> r=mkanat for the main patch, r=myk for the patch about CGI.pm a=justdave
Bug 328637: Remove all legal_* versioncache arrays - Patch by Frédéric Buclin <LpSolit@gmail.com> r=mkanat a=justdave
Bug 110503 - Eliminate versioncache
Diffstat (limited to 'Bugzilla/Error.pm')
| -rw-r--r-- | Bugzilla/Error.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm index d23e68d78..5498f7670 100644 --- a/Bugzilla/Error.pm +++ b/Bugzilla/Error.pm @@ -26,7 +26,6 @@ use base qw(Exporter); @Bugzilla::Error::EXPORT = qw(ThrowCodeError ThrowTemplateError ThrowUserError); -use Bugzilla::Config qw($datadir); use Bugzilla::Constants; use Bugzilla::Util; use Date::Format; @@ -42,6 +41,7 @@ sub _throw_error { # and the transaction is rolled back (if supported) Bugzilla->dbh->bz_unlock_tables(UNLOCK_ABORT); + my $datadir = bz_locations()->{'datadir'}; # If a writable $datadir/errorlog exists, log error details there. if (-w "$datadir/errorlog") { require Data::Dumper; @@ -115,9 +115,9 @@ sub ThrowTemplateError { # Try a template first; but if this one fails too, fall back # on plain old print statements. if (!$template->process("global/code-error.html.tmpl", $vars)) { - my $maintainer = Bugzilla::Config::Param('maintainer'); - my $error = Bugzilla::Util::html_quote($vars->{'template_error_msg'}); - my $error2 = Bugzilla::Util::html_quote($template->error()); + my $maintainer = Bugzilla->params->{'maintainer'}; + my $error = html_quote($vars->{'template_error_msg'}); + my $error2 = html_quote($template->error()); print <<END; <tt> <p> |