1
1
Fork 0

Merge pull request #4745 from annando/register-mess

Fix: The register mail contained variables in a wrong order
This commit is contained in:
Hypolite Petovan 2018-04-04 16:07:23 -04:00 committed by GitHub
commit 1e6a4eb861
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -615,9 +615,9 @@ class User
$body = deindent(L10n::t(' $body = deindent(L10n::t('
The login details are as follows: The login details are as follows:
Site Location: %1$s Site Location: %3$s
Login Name: %2$s Login Name: %1$s
Password: %3$s Password: %5$s
You may change your password from your account "Settings" page after logging You may change your password from your account "Settings" page after logging
in. in.
@ -636,9 +636,9 @@ class User
If you are new and do not know anybody here, they may help If you are new and do not know anybody here, they may help
you to make some new and interesting friends. you to make some new and interesting friends.
If you ever want to delete your account, you can do so at %1$s/removeme If you ever want to delete your account, you can do so at %3$s/removeme
Thank you and welcome to %4$s.')); Thank you and welcome to %2$s.'));
$preamble = sprintf($preamble, $username, $sitename); $preamble = sprintf($preamble, $username, $sitename);
$body = sprintf($body, $email, $sitename, $siteurl, $username, $password); $body = sprintf($body, $email, $sitename, $siteurl, $username, $password);