diff options
author | Dave Lawrence <dlawrence@mozilla.com> | 2012-03-19 04:11:53 +0100 |
---|---|---|
committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-03-19 04:11:53 +0100 |
commit | 8f0cc43947fd5d93178b7f98c9548e1c4974d0b3 (patch) | |
tree | 48b837d8586d8f53bc32237bd7fb7ac518585421 /Bugzilla | |
parent | 0709dae3eca4422295ad979b85dd8758e2426b76 (diff) | |
parent | 16ca329e85e1a36a4808cc088ebc8f5d18f22dae (diff) | |
download | bugzilla-8f0cc43947fd5d93178b7f98c9548e1c4974d0b3.tar.gz bugzilla-8f0cc43947fd5d93178b7f98c9548e1c4974d0b3.tar.xz |
merge with bugzilla/4.2
Diffstat (limited to 'Bugzilla')
-rw-r--r-- | Bugzilla/Hook.pm | 24 | ||||
-rw-r--r-- | Bugzilla/Search.pm | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/Bugzilla/Hook.pm b/Bugzilla/Hook.pm index b2ea820c7..564c5bc49 100644 --- a/Bugzilla/Hook.pm +++ b/Bugzilla/Hook.pm @@ -1354,6 +1354,30 @@ name), you can get it from here. =back +=head2 admin_editusers_action + +This hook allows you to add additional actions to the admin Users page. + +Params: + +=over + +=item C<vars> + +You can add as many new key/value pairs as you want to this hashref. +It will be passed to the template. + +=item C<action> + +A text which indicates the different behaviors that edit_users.cgi will have. +With this hook you can change the behavior of an action or add new actions. + +=item C<user> + +This is a Bugzilla::User object of the user. + +=back + =head2 user_preferences This hook allows you to add additional panels to the User Preferences page, diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm index 0c5b65acf..55a14d9e0 100644 --- a/Bugzilla/Search.pm +++ b/Bugzilla/Search.pm @@ -809,7 +809,7 @@ sub _extra_columns { my ($self) = @_; # Everything that's going to be in the ORDER BY must also be # in the SELECT. - $self->{extra_columns} ||= [ $self->_input_order_columns ]; + push(@{ $self->{extra_columns} }, $self->_input_order_columns); return @{ $self->{extra_columns} }; } |