From 06ddd8645eb477726941664baa46f37a5ab21ee9 Mon Sep 17 00:00:00 2001
From: "bugreport%peshkin.net" <bugreport%peshkin.net>
Date: Fri, 30 Jul 2004 10:37:17 +0000
Subject: [PATCH] Bug 253447: Fix unhelpful error if user enters text in
 "blocks" field r=kiko a=justdave

---
 webtools/bugzilla/CGI.pl                                    | 2 +-
 .../template/en/default/global/user-error.html.tmpl         | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/webtools/bugzilla/CGI.pl b/webtools/bugzilla/CGI.pl
index bb271cf9490..15c773a8645 100644
--- a/webtools/bugzilla/CGI.pl
+++ b/webtools/bugzilla/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/webtools/bugzilla/template/en/default/global/user-error.html.tmpl b/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
index 503715ba226..fcd3ca4fd93 100644
--- a/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
+++ b/webtools/bugzilla/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'" %]