aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2005-10-25 06:11:55 +0000
committerlpsolit%gmail.com <>2005-10-25 06:11:55 +0000
commit44de29d04d1ca7e3b047b2a847508dc949c29038 (patch)
tree934c0ccce39c238b3bf6a0337014e6f1fde9918b /token.cgi
parentBug 313209: Oracle requires "CASE WHEN" around boolean expressions in the SEL... (diff)
downloadbugzilla-44de29d04d1ca7e3b047b2a847508dc949c29038.tar.gz
bugzilla-44de29d04d1ca7e3b047b2a847508dc949c29038.tar.bz2
bugzilla-44de29d04d1ca7e3b047b2a847508dc949c29038.zip
Bug 312157: Remove $::template and $::vars from globals.pl - Patch by Olav Vitters <bugzilla-mozilla@bkor.dhs.org> r=LpSolit a=justdave
Diffstat (limited to 'token.cgi')
-rwxr-xr-xtoken.cgi8
1 files changed, 4 insertions, 4 deletions
diff --git a/token.cgi b/token.cgi
index 3c818bc23..aaac4f7ac 100755
--- a/token.cgi
+++ b/token.cgi
@@ -29,14 +29,14 @@ use strict;
use lib qw(.);
-use vars qw($template $vars);
-
use Bugzilla;
use Bugzilla::Constants;
use Bugzilla::Util;
my $cgi = Bugzilla->cgi;
my $dbh = Bugzilla->dbh;
+my $template = Bugzilla->template;
+my $vars = {};
# Include the Bugzilla CGI and general utility library.
require "globals.pl";
@@ -250,7 +250,7 @@ sub changeEmail {
# confirmed initially so cancel token if it is not still available
if (! is_available_username($new_email,$old_email)) {
$vars->{'email'} = $new_email; # Needed for Bugzilla::Token::Cancel's mail
- Bugzilla::Token::Cancel($::token,"account_exists");
+ Bugzilla::Token::Cancel($::token, "account_exists", $vars);
ThrowUserError("account_exists", { email => $new_email } );
}
@@ -324,7 +324,7 @@ sub cancelChangeEmail {
$vars->{'old_email'} = $old_email;
$vars->{'new_email'} = $new_email;
- Bugzilla::Token::Cancel($::token, $vars->{'message'});
+ Bugzilla::Token::Cancel($::token, $vars->{'message'}, $vars);
$dbh->bz_lock_tables('tokens WRITE');
$dbh->do(q{DELETE FROM tokens WHERE userid = ?