summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorgerv%gerv.net <>2002-04-24 16:24:43 +0200
committergerv%gerv.net <>2002-04-24 16:24:43 +0200
commit05d101e58b400b1a52adcc86515b5442b85cd2f5 (patch)
treeded36788873d147ce2a62bd76239e0e99974c621 /Bugzilla
parentc29a6dcb565731ef6757a625b7374e7ff46d417c (diff)
downloadbugzilla-05d101e58b400b1a52adcc86515b5442b85cd2f5.tar.gz
bugzilla-05d101e58b400b1a52adcc86515b5442b85cd2f5.tar.xz
Bug 138588 - change to use new template structure. Patch by gerv, r=myk, afranke.
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Token.pm15
1 files changed, 6 insertions, 9 deletions
diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index 9c136184b..39584bd9c 100644
--- a/Bugzilla/Token.pm
+++ b/Bugzilla/Token.pm
@@ -71,9 +71,8 @@ sub IssueEmailChangeToken {
$vars->{'emailaddress'} = $old_email . &::Param('emailsuffix');
my $message;
- $template->process("token/emailchangeold.txt.tmpl", $vars, \$message)
- || &::DisplayError("Template process failed: " . $template->error())
- && exit;
+ $template->process("account/email/change-old.txt.tmpl", $vars, \$message)
+ || &::ThrowTemplateError($template->error());
open SENDMAIL, "|/usr/lib/sendmail -t -i";
print SENDMAIL $message;
@@ -83,9 +82,8 @@ sub IssueEmailChangeToken {
$vars->{'emailaddress'} = $new_email . &::Param('emailsuffix');
$message = "";
- $template->process("token/emailchangenew.txt.tmpl", $vars, \$message)
- || &::DisplayError("Template process failed: " . $template->error())
- && exit;
+ $template->process("account/email/change-new.txt.tmpl", $vars, \$message)
+ || &::ThrowTemplateError($template->error());
open SENDMAIL, "|/usr/lib/sendmail -t -i";
print SENDMAIL $message;
@@ -222,9 +220,8 @@ sub Cancel {
# Notify the user via email about the cancellation.
my $message;
- $template->process("token/tokencancel.txt.tmpl", $vars, \$message)
- || &::DisplayError("Template process failed: " . $template->error())
- && exit;
+ $template->process("account/cancel-token.txt.tmpl", $vars, \$message)
+ || &::ThrowTemplateError($template->error());
open SENDMAIL, "|/usr/lib/sendmail -t -i";
print SENDMAIL $message;