Bug 1076155: Remove "?" from table columns and labels + code cleanup

r=dkl a=justdave

1 files changed, 7 insertions, 13 deletions

diff --git a/userprefs.cgi b/userprefs.cgi
index bb57b56b3..ad5fb7d19 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -526,8 +526,8 @@ sub SaveApiKey {
     # Update any existing keys
     my $api_keys = Bugzilla::User::APIKey->match({ user_id => $user->id });
     foreach my $api_key (@$api_keys) {
-        my $description = $cgi->param('description_'.$api_key->id);
-        my $revoked = $cgi->param('revoked_'.$api_key->id);
+        my $description = $cgi->param('description_' . $api_key->id);
+        my $revoked = $cgi->param('revoked_' . $api_key->id);
 
         if ($description ne $api_key->description
             || $revoked != $api_key->revoked)
@@ -540,25 +540,19 @@ sub SaveApiKey {
         }
     }
 
-    # Was a new api key requested
+    # Create a new API key if requested.
     if ($cgi->param('new_key')) {
-        my $new_key = Bugzilla::User::APIKey->create({
+        $vars->{new_key} = Bugzilla::User::APIKey->create({
             user_id     => $user->id,
             description => $cgi->param('new_description'),
         });
 
         # As a security precaution, we always sent out an e-mail when
         # an API key is created
-        my $lang = $user->setting('lang')
-            // Bugzilla::User->new()->setting('lang');
-
-        my $template = Bugzilla->template_inner($lang);
+        my $template = Bugzilla->template_inner($user->setting('lang'));
         my $message;
-        $template->process(
-            'email/new-api-key.txt.tmpl',
-            { user => $user, new_key => $new_key },
-            \$message
-        ) || ThrowTemplateError($template->error());
+        $template->process('email/new-api-key.txt.tmpl', $vars, \$message)
+          || ThrowTemplateError($template->error());
 
         MessageToMTA($message);
     }