diff options
| -rw-r--r-- | CGI.pl | 3 | ||||
| -rwxr-xr-x | process_bug.cgi | 2 | ||||
| -rw-r--r-- | template/en/default/global/code-error.html.tmpl | 7 |
3 files changed, 9 insertions, 3 deletions
@@ -111,10 +111,11 @@ sub CheckFormField (\%$;\@) { sub CheckFormFieldDefined (\%$) { my ($formRef, # a reference to the form to check (a hash) $fieldname, # the fieldname to check + $info, # (optional) error message to give ) = @_; if (!defined $formRef->{$fieldname}) { - ThrowCodeError("undefined_field", { field => $fieldname }); + ThrowCodeError("undefined_field", { field => $fieldname, info => $info }); } } diff --git a/process_bug.cgi b/process_bug.cgi index e504fd7ea..d3155af33 100755 --- a/process_bug.cgi +++ b/process_bug.cgi @@ -858,7 +858,7 @@ if (defined $::FORM{newcc} || defined $::FORM{removecc} || defined $::FORM{massc } -CheckFormFieldDefined(\%::FORM, 'knob'); +CheckFormFieldDefined(\%::FORM, 'knob', "check that \"Leave as...\" was selected."); SWITCH: for ($::FORM{'knob'}) { /^none$/ && do { last SWITCH; diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 73501672b..458f55c55 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -208,7 +208,12 @@ I was unable to retrieve your old password from the database. [% ELSIF error == "undefined_field" %] - [% field FILTER html %] was not defined; [% Param('browserbugmessage') %] + [% field FILTER html %] was not defined; + [% IF info %] + [% info FILTER html %] + [% ELSE %] + [% Param('browserbugmessage') %] + [% END %] [% ELSIF error == "unknown_action" %] [% IF action %] |