Bug 364250: If a hook fails, no error is available for diagnosis

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=colin, a=myk

diff --git a/Bugzilla/Hook.pm b/Bugzilla/Hook.pm
index f8167cd650966545190e1b764955dd30b22ef136..3e784bd0ed02856a3e3a895474d091feaba965cf 100644 (file)
--- 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 d48b89993e4ac9fa531da9f07008b0edf78d0bdb..b92fa443621fa40f23a9b87c917f3e7b975ba41d 100644 (file)
--- 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