diff options
| author | Gervase Markham <gerv@gerv.net> | 2014-01-27 15:59:36 +0100 |
|---|---|---|
| committer | Gervase Markham <gerv@mozilla.org> | 2014-01-27 15:59:36 +0100 |
| commit | 10cc520ecb23683b3ae83a817e4457bc2fdc01fb (patch) | |
| tree | 7e56e83fb71bc23066ddc7a99c1589cb3419931e /Bugzilla | |
| parent | eb7d562ca51276b6f448a1ae0e676132c7d35b03 (diff) | |
| download | bugzilla-10cc520ecb23683b3ae83a817e4457bc2fdc01fb.tar.gz bugzilla-10cc520ecb23683b3ae83a817e4457bc2fdc01fb.tar.xz | |
Bug 939838 - Kill Bugzilla::User::user_id_to_login function. r=LpSolit, a=justdave.
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Bug.pm | 4 | ||||
| -rw-r--r-- | Bugzilla/BugMail.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/User.pm | 19 |
3 files changed, 4 insertions, 21 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index b4e8c361a..95bf293a5 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -2187,8 +2187,8 @@ sub _set_global_validator { my $can = $self->check_can_change_field($field, $current, $value, \$privs); if (!$can) { if ($field eq 'assigned_to' || $field eq 'qa_contact') { - $value = user_id_to_login($value); - $current = user_id_to_login($current); + $value = Bugzilla::User->new($value)->login; + $current = Bugzilla::User->new($current)->login; } ThrowUserError('illegal_change', { field => $field, oldvalue => $current, diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index 48222fbf7..d66df579d 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -344,7 +344,7 @@ sub sendMail { my @watchingrel = map { $relationships{$_} } @reasons_watch; push(@headerrel, 'None') unless @headerrel; push(@watchingrel, 'None') unless @watchingrel; - push @watchingrel, map { user_id_to_login($_) } @$watchingRef; + push @watchingrel, map { Bugzilla::User->new($_)->login } @$watchingRef; my @changedfields = uniq map { $_->{field_name} } @display_diffs; diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm index 1bd6c0b19..5ded9f06e 100644 --- a/Bugzilla/User.pm +++ b/Bugzilla/User.pm @@ -28,7 +28,7 @@ use URI::QueryParam; use parent qw(Bugzilla::Object Exporter); @Bugzilla::User::EXPORT = qw(is_available_username - login_to_id user_id_to_login validate_password + login_to_id validate_password USER_MATCH_MULTIPLE USER_MATCH_FAILED USER_MATCH_SUCCESS MATCH_SKIP_CONFIRM ); @@ -2193,17 +2193,6 @@ sub login_to_id { } } -sub user_id_to_login { - my $user_id = shift; - my $dbh = Bugzilla->dbh; - - return '' unless ($user_id && detaint_natural($user_id)); - - my $login = $dbh->selectrow_array('SELECT login_name FROM profiles - WHERE userid = ?', undef, $user_id); - return $login || ''; -} - sub validate_password { my ($password, $matchpassword) = @_; @@ -2831,12 +2820,6 @@ of a user, but you don't want the full weight of Bugzilla::User. However, consider using a Bugzilla::User object instead of this function if you need more information about the user than just their ID. -=item C<user_id_to_login($user_id)> - -Returns the login name of the user account for the given user ID. If no -valid user ID is given or the user has no entry in the profiles table, -we return an empty string. - =item C<validate_password($passwd1, $passwd2)> Returns true if a password is valid (i.e. meets Bugzilla's |