summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Search.pm6
-rw-r--r--Bugzilla/WebService/Bug.pm10
-rw-r--r--template/en/default/account/auth/login-small.html.tmpl3
-rw-r--r--template/en/default/account/auth/login.html.tmpl2
-rw-r--r--template/en/default/admin/users/search.html.tmpl3
-rw-r--r--template/en/default/email/bugmail.html.tmpl2
6 files changed, 17 insertions, 9 deletions
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 55a14d9e0..2655ec467 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -1668,7 +1668,11 @@ sub _handle_chart {
$search_args{quoted} = $self->_quote_unless_numeric(\%search_args);
# This should add a "term" selement to %search_args.
$self->do_search_function(\%search_args);
-
+
+ # If term is left empty, then this means the criteria
+ # has no effect and can be ignored.
+ return unless $search_args{term};
+
# All the things here that don't get pulled out of
# %search_args are their original values before
# do_search_function modified them.
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 1ac7bf206..243031800 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -2224,6 +2224,9 @@ May not be an array.
C<string> The login name of the user who created the bug.
+You can also pass this argument with the name C<reporter>, for
+backwards compatibility with older Bugzillas.
+
=item C<id>
C<int> The numeric id of the bug.
@@ -2260,13 +2263,6 @@ C<string> The Priority field on a bug.
C<string> The name of the Product that the bug is in.
-=item C<creator>
-
-C<string> The login name of the user who reported the bug.
-
-You can also pass this argument with the name C<reporter>, for
-backwards compatibility with older Bugzillas.
-
=item C<resolution>
C<string> The current resolution--only set if a bug is closed. You can
diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index 14efbc367..b073c79cc 100644
--- a/template/en/default/account/auth/login-small.html.tmpl
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -39,6 +39,9 @@
[% script_name = login_target _ connector _ "GoAheadAndLogIn=1" %]
<a id="login_link[% qs_suffix %]" href="[% script_name FILTER html %]"
onclick="return show_mini_login_form('[% qs_suffix %]')">Log In</a>
+
+ [% Hook.process('additional_methods') %]
+
<form action="[% login_target FILTER html %]" method="POST"
class="mini_login bz_default_hidden"
id="mini_login[% qs_suffix FILTER html %]"
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index f11c33cdc..ec8c11e24 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -91,6 +91,8 @@
</p>
</form>
+[% Hook.process('additional_methods') %]
+
[%# Allow the user to create a new account, or request a token to change
# their password, assuming that our auth method allows that.
#%]
diff --git a/template/en/default/admin/users/search.html.tmpl b/template/en/default/admin/users/search.html.tmpl
index 82e0afda7..36ca48ed8 100644
--- a/template/en/default/admin/users/search.html.tmpl
+++ b/template/en/default/admin/users/search.html.tmpl
@@ -62,6 +62,9 @@
[% END %]
</select></p>
[% END %]
+
+[% Hook.process('end') %]
+
</form>
[% IF editusers %]
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index fa3a447d7..e42b5564d 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -124,5 +124,5 @@
</tr>
[% END %]
[% END %]
- </table>
+ [% '</table>' IF in_table %]
[% END %]