diff options
author | Imran Chaudhry <ichaudhry+mozilla@gmail.com> | 2013-09-28 01:09:29 +0200 |
---|---|---|
committer | Frédéric Buclin <LpSolit@gmail.com> | 2013-09-28 01:09:29 +0200 |
commit | 51e15329e9cf5c4a7a492b0a8689d436f012f45d (patch) | |
tree | 71eb93d3c4b903c470d6c48320e44a2312018cf4 | |
parent | 2d802ebc16003e27fe86295ccd6b7c47996c7314 (diff) | |
download | bugzilla-51e15329e9cf5c4a7a492b0a8689d436f012f45d.tar.gz bugzilla-51e15329e9cf5c4a7a492b0a8689d436f012f45d.tar.xz |
Bug 798927: An error should be thrown when passing an illegal pronoun
r=LpSolit a=justdave
-rw-r--r-- | Bugzilla/Search.pm | 3 | ||||
-rw-r--r-- | template/en/default/global/user-error.html.tmpl | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm index a7600f449..7bd4381ed 100644 --- a/Bugzilla/Search.pm +++ b/Bugzilla/Search.pm @@ -2196,7 +2196,8 @@ sub pronoun { if ($noun eq "%qacontact%") { return "COALESCE(bugs.qa_contact,0)"; } - return 0; + + ThrowUserError('illegal_pronoun', { pronoun => $noun }); } sub _contact_pronoun { diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 1a3aa07ac..939eb2c3c 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -891,6 +891,13 @@ Your group control combination for group " [% groupname FILTER html %]" is illegal. + [% ELSIF error == "illegal_pronoun" %] + [% title = "Illegal Pronoun" %] + The pronoun you used ([% pronoun FILTER html %]) is illegal. You must use + one of the approved pronouns. Please see + <a href="[% docs_urlbase FILTER html %]query.html#pronouns">Pronoun Substitution</a> + for a complete list. + [% ELSIF error == "illegal_query_name" %] [% title = "Illegal Search Name" %] The name of your search cannot contain any of the following characters: |