aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2020-01-27 13:12:36 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2020-01-27 13:13:19 -0800
commitc1ddf99fe3ca365adabae0b64f2b1eb9cd95e77c (patch)
tree8bd404f3de72b7275d531997a130a971db52f8e8 /userprefs.cgi
parentMerge commit '7f3a749d7bd78a3e4aee163f562d7e95b0954b44' into bugstest (diff)
parentbump version and add release notes for 5.0.6 (diff)
downloadbugzilla-c1ddf99fe3ca365adabae0b64f2b1eb9cd95e77c.tar.gz
bugzilla-c1ddf99fe3ca365adabae0b64f2b1eb9cd95e77c.tar.bz2
bugzilla-c1ddf99fe3ca365adabae0b64f2b1eb9cd95e77c.zip
Merge tag 'release-5.0.6' into bugstest
Merge upstream 5.0.6 release, now without conflicts after the problematic code reformatting change. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'userprefs.cgi')
-rwxr-xr-xuserprefs.cgi4
1 files changed, 2 insertions, 2 deletions
diff --git a/userprefs.cgi b/userprefs.cgi
index 9dcdb5254..6f79160c0 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -305,7 +305,7 @@ sub SaveEmail {
# The new information given to us by the user.
my $new_watched_users = join(',', $cgi->param('new_watchedusers')) || '';
- my @new_watch_names = split(/[,\s]+/, $new_watched_users);
+ my @new_watch_names = split(/[,\s]+/, $new_watched_users);
my %new_watch_ids;
foreach my $username (@new_watch_names) {
@@ -546,7 +546,7 @@ sub DoApiKey {
my $user = Bugzilla->user;
my $api_keys = Bugzilla::User::APIKey->match({user_id => $user->id});
- $vars->{api_keys} = $api_keys;
+ $vars->{api_keys} = $api_keys;
$vars->{any_revoked} = grep { $_->revoked } @$api_keys;
}