Bug 253447: Fix unhelpful error if user enters text in "blocks" field

r=kiko
a=justdave

diff --git a/CGI.pl b/CGI.pl
index 94e727f0896a742c661054e2c65ea0a2c735e9b7..4912610bcc071ee9def7bd6337eecfc0bca22b0d 100644 (file)
--- 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 af99313f03bb26df8aa76a2915c200a45307c507..040cc81b57a0ad6444c8b8b04cd97a18c981a048 100644 (file)
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -335,15 +335,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'" %]