Bug 208699 - Move Throw{Code,Template}Error into Error.pm

r,a=justdave

1 files changed, 6 insertions, 4 deletions

diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index f5df92063..32e624913 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -33,6 +33,7 @@ use strict;
 package Bugzilla::User;
 
 use Bugzilla::Config;
+use Bugzilla::Error;
 use Bugzilla::Util;
 
 ################################################################################
@@ -551,9 +552,10 @@ sub match_field {
         }
         else {
             # bad argument
-            $vars->{'argument'} = $fields->{$field}->{'type'};
-            $vars->{'function'} = 'Bugzilla::User::match_field';
-            &::ThrowCodeError('bad_arg');
+            ThrowCodeError('bad_arg',
+                           { argument => $fields->{$field}->{'type'},
+                             function =>  'Bugzilla::User::match_field',
+                           });
         }
 
         for my $query (@queries) {
@@ -623,7 +625,7 @@ sub match_field {
     print Bugzilla->cgi->header();
 
     $::template->process("global/confirm-user-match.html.tmpl", $vars)
-      || &::ThrowTemplateError($::template->error());
+      || ThrowTemplateError($::template->error());
 
     exit;