From 40e63525a8bda9132a4d2c0d296b2b7e89fe75de Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Thu, 19 Apr 2007 15:05:20 +0000 Subject: Bug 369933: Use Bugzilla::Util::correct_urlbase() everywhere in templates to get the correct URL to the Bugzilla installation - Patch by Alex Eiser r/a=LpSolit --- template/en/default/account/email/change-new.txt.tmpl | 4 ++-- template/en/default/account/email/change-old.txt.tmpl | 2 +- template/en/default/account/email/request-new.txt.tmpl | 4 ++-- template/en/default/account/password/forgotten-password.txt.tmpl | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'template/en/default/account') diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl index d3494e62a..e7d3d6ba1 100644 --- a/template/en/default/account/email/change-new.txt.tmpl +++ b/template/en/default/account/email/change-new.txt.tmpl @@ -32,12 +32,12 @@ for the account [% oldemailaddress %] to your address. To confirm the change, visit the following link: -[%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cfmem +[%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cfmem If you are not the person who made this request, or you wish to cancel this request, visit the following link: -[%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cxlem +[%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cxlem If you do nothing, the request will lapse after [%+ max_token_age %] days (on [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]). diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl index b50cbfa1b..7b229977b 100644 --- a/template/en/default/account/email/change-old.txt.tmpl +++ b/template/en/default/account/email/change-old.txt.tmpl @@ -41,7 +41,7 @@ for your account to [%+ newemailaddress %]. If you are not the person who made this request, or you wish to cancel this request, visit the following link: -[%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cxlem +[%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cxlem If you do nothing, and [%+ newemailaddress %] confirms this request, the change will be made permanent after [%+ max_token_age %] days diff --git a/template/en/default/account/email/request-new.txt.tmpl b/template/en/default/account/email/request-new.txt.tmpl index 3fcdddfd1..3248e4b38 100644 --- a/template/en/default/account/email/request-new.txt.tmpl +++ b/template/en/default/account/email/request-new.txt.tmpl @@ -34,12 +34,12 @@ using your email address ([% email %]). To confirm that you want to create an account using that email address, visit the following link: -[%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=request_new_account +[%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=request_new_account If you are not the person who made this request, or you wish to cancel this request, visit the following link: -[%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cancel_new_account +[%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cancel_new_account If you do nothing, the request will lapse after [%+ constants.MAX_TOKEN_AGE %] days (on [%+ time2str("%B %o, %Y at %H:%M %Z", expiration_ts) %]). diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl index 75720e7c8..bd6cd3db9 100644 --- a/template/en/default/account/password/forgotten-password.txt.tmpl +++ b/template/en/default/account/password/forgotten-password.txt.tmpl @@ -30,12 +30,12 @@ X-Bugzilla-Type: admin You have (or someone impersonating you has) requested to change your [%+ terms.Bugzilla %] password. To complete the change, visit the following link: -[%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cfmpw +[%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cfmpw If you are not the person who made this request, or you wish to cancel this request, visit the following link: -[%+ Param('urlbase') %]token.cgi?t=[% token FILTER url_quote %]&a=cxlpw +[%+ urlbase %]token.cgi?t=[% token FILTER url_quote %]&a=cxlpw If you do nothing, the request will lapse after [%+ max_token_age +%] days (at precisely [%+ time2str("%H:%M on the %o of %B, %Y", expiration_ts) -%]) or when you -- cgit v1.2.3-24-g4f1b