summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbugreport%peshkin.net <>2004-07-30 19:37:02 +0200
committerbugreport%peshkin.net <>2004-07-30 19:37:02 +0200
commitd0b82de8afb79809f8ecc3d39c337b2bcf46b0bc (patch)
treebb4b6f68da95eda2bea8202bf502aac08c8b34f3
parent82357809ddc5fcc41680149d1ad7a27045bbdaf9 (diff)
downloadbugzilla-d0b82de8afb79809f8ecc3d39c337b2bcf46b0bc.tar.gz
bugzilla-d0b82de8afb79809f8ecc3d39c337b2bcf46b0bc.tar.xz
Bug 253447: Fix unhelpful error if user enters text in "blocks" field
r=kiko a=justdave
-rw-r--r--CGI.pl2
-rw-r--r--template/en/default/global/user-error.html.tmpl6
2 files changed, 3 insertions, 5 deletions
diff --git a/CGI.pl b/CGI.pl
index bb271cf94..15c773a86 100644
--- a/CGI.pl
+++ b/CGI.pl
@@ -157,7 +157,7 @@ sub ValidateBugID {
my $alias = $id;
if (!detaint_natural($id)) {
$id = BugAliasToID($alias);
- $id || ThrowUserError("invalid_bug_id_or_alias", {'bug_id' => $id});
+ $id || ThrowUserError("invalid_bug_id_or_alias", {'bug_id' => $alias});
}
# Modify the calling code's original variable to contain the trimmed,
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 503715ba2..fcd3ca4fd 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -356,15 +356,13 @@
[% ELSIF error == "invalid_bug_id_or_alias" %]
[% title = BLOCK %]Invalid [% terms.Bug %] ID[% END %]
- The '[% terms.bug %] number' <em>[% bug_id FILTER html %]</em> is invalid.
+ '[% bug_id FILTER html %]' is not a valid [% terms.bug %] number.
[% IF Param("usebugaliases") %]
It is neither [% terms.abug %] number nor an alias to [% terms.abug %]
number.
[% END %]
If you are trying to use QuickSearch, you need to enable JavaScript
- in your browser. To help us fix this limitation, add your comments to
- <a href="http://bugzilla.mozilla.org/show_bug.cgi?id=70907">b<!--
- word broken up to pass test 009 -->ug 70907</a>.
+ in your browser.
[% ELSIF error == "invalid_changedsince" %]
[% title = "Invalid 'Changed Since'" %]