Skip to content
Snippets Groups Projects
Commit 5883c410 authored by Daniel Gerhardt's avatar Daniel Gerhardt
Browse files

Fix URL pattern for account mails

String placeholders were numbered incorrectly.

Fixes #47.
parent 9bbff2ed
No related merge requests found
Pipeline #29783 passed with warnings with stages
in 1 minute and 42 seconds
...@@ -462,7 +462,7 @@ public class UserServiceImpl extends DefaultEntityServiceImpl<UserProfile> imple ...@@ -462,7 +462,7 @@ public class UserServiceImpl extends DefaultEntityServiceImpl<UserProfile> imple
private void sendActivationEmail(final UserProfile userProfile) { private void sendActivationEmail(final UserProfile userProfile) {
final String activationKey = userProfile.getAccount().getActivationKey(); final String activationKey = userProfile.getAccount().getActivationKey();
final String activationUrl = MessageFormat.format( final String activationUrl = MessageFormat.format(
"{0}{1}/login?action=activate&username={3}&key={4}", "{0}{1}/login?action=activate&username={2}&key={3}",
rootUrl, rootUrl,
customizationPath, customizationPath,
UriUtils.encodeQueryParam(userProfile.getLoginId(), "UTF-8"), UriUtils.encodeQueryParam(userProfile.getLoginId(), "UTF-8"),
...@@ -570,7 +570,7 @@ public class UserServiceImpl extends DefaultEntityServiceImpl<UserProfile> imple ...@@ -570,7 +570,7 @@ public class UserServiceImpl extends DefaultEntityServiceImpl<UserProfile> imple
} }
final String resetPasswordUrl = MessageFormat.format( final String resetPasswordUrl = MessageFormat.format(
"{0}{1}/login?action=resetpassword&username={3}&key={4}", "{0}{1}/login?action=resetpassword&username={2}&key={3}",
rootUrl, rootUrl,
customizationPath, customizationPath,
UriUtils.encodeQueryParam(userProfile.getLoginId(), "UTF-8"), account.getPasswordResetKey()); UriUtils.encodeQueryParam(userProfile.getLoginId(), "UTF-8"), account.getPasswordResetKey());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment