diff options
| author | mkanat%bugzilla.org <> | 2006-12-19 15:43:10 +0100 |
|---|---|---|
| committer | mkanat%bugzilla.org <> | 2006-12-19 15:43:10 +0100 |
| commit | a32a16cafd772c918f2487423aa3317149bfff75 (patch) | |
| tree | 5ca78e510ad53e140b05da8b8283198e8ee09cf5 | |
| parent | bffa52bd4899458aca4456717dd11786cc585640 (diff) | |
| download | bugzilla-a32a16cafd772c918f2487423aa3317149bfff75.tar.gz bugzilla-a32a16cafd772c918f2487423aa3317149bfff75.tar.xz | |
Bug 364250: If a hook fails, no error is available for diagnosis
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=colin, a=myk
| -rw-r--r-- | Bugzilla/Hook.pm | 4 | ||||
| -rw-r--r-- | template/en/default/global/code-error.html.tmpl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Bugzilla/Hook.pm b/Bugzilla/Hook.pm index f8167cd65..3e784bd0e 100644 --- a/Bugzilla/Hook.pm +++ b/Bugzilla/Hook.pm @@ -44,8 +44,8 @@ sub process { if (-e $extension.'/code/'.$name.'.pl') { Bugzilla->hook_args($args); do($extension.'/code/'.$name.'.pl'); - ThrowCodeError('extension_invalid', { - name => $name, extension => $extension }) if $@; + ThrowCodeError('extension_invalid', + { errstr => $@, name => $name, extension => $extension }) if $@; } } diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index d48b89993..b92fa4436 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -139,7 +139,7 @@ [% ELSIF error == "extension_invalid" %] An error occurred processing hook [% name FILTER html %] in - extension [% extension FILTER html %]. + extension [% extension FILTER html %]: [% errstr FILTER html %] [% ELSIF error == "extern_id_conflict" %] The external ID '[% extern_id FILTER html %]' already exists |