diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2016-04-13 21:55:50 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2016-04-13 21:55:50 +0200 |
| commit | 49293a63bad7c62eacd8c3465dd16fdd5069338a (patch) | |
| tree | a21e1b52a882f1c6108dcb54142cc10ce3b8c39a /Bugzilla/Error.pm | |
| parent | 197afbecb29bbc96f88c4868541a19172d86e485 (diff) | |
| download | bugzilla-49293a63bad7c62eacd8c3465dd16fdd5069338a.tar.gz bugzilla-49293a63bad7c62eacd8c3465dd16fdd5069338a.tar.xz | |
Revert "Bug 1195736 - intermittent internal error: "file error - nav_link: not found" (also manifests as fields_lhs: not found)"
Test failures result from this, we will need a different approach.
This reverts commit 33f61556746e1729746342d802ca7ea9cea18caf.
Diffstat (limited to 'Bugzilla/Error.pm')
| -rw-r--r-- | Bugzilla/Error.pm | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm index 927745201..fa898fba4 100644 --- a/Bugzilla/Error.pm +++ b/Bugzilla/Error.pm @@ -99,13 +99,8 @@ sub _throw_error { # and calling $template->process over and over for those errors # is too slow. So instead, we just "die" with a dump of the arguments. if (Bugzilla->error_mode != ERROR_MODE_TEST) { - if (Bugzilla->template->in_process) { - $message = "error inside Bugzilla->template->process: $error"; - } - else { - $template->process($name, $vars, \$message) - || ThrowTemplateError($template->error()); - } + $template->process($name, $vars, \$message) + || ThrowTemplateError($template->error()); } # Let's call the hook first, so that extensions can override |