diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-09-18 21:17:47 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-09-18 21:50:56 +0100 |
| commit | 4c9729fb95eef184fc375252b45de126173ab3e4 (patch) | |
| tree | 3d9bbcd29745454535e80013284bd3e48e487769 /resources/views/emails | |
| parent | 8b45f7275a3c3b628bfa5579a1b9f315ea033ca1 (diff) | |
| download | webtrees-4c9729fb95eef184fc375252b45de126173ab3e4.tar.gz webtrees-4c9729fb95eef184fc375252b45de126173ab3e4.tar.bz2 webtrees-4c9729fb95eef184fc375252b45de126173ab3e4.zip | |
Fix: #2575 and #1945 - update email from/reply-to fields, allow registration on private sites
Diffstat (limited to 'resources/views/emails')
| -rw-r--r-- | resources/views/emails/register-user-html.phtml | 4 | ||||
| -rw-r--r-- | resources/views/emails/register-user-text.phtml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/resources/views/emails/register-user-html.phtml b/resources/views/emails/register-user-html.phtml index 561fbe77fa..bf97d86091 100644 --- a/resources/views/emails/register-user-html.phtml +++ b/resources/views/emails/register-user-html.phtml @@ -14,8 +14,8 @@ </p> <p> - <a href="<?= e(route('verify', ['username' => $user->userName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true)) ?>"> - <?= e(route('verify', ['username' => $user->userName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true)) ?> + <a href="<?= e(route('verify', ['username' => $user->userName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree ? $tree->name() : ''])) ?>"> + <?= e(route('verify', ['username' => $user->userName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree ? $tree->name() : ''])) ?> </a> </p> diff --git a/resources/views/emails/register-user-text.phtml b/resources/views/emails/register-user-text.phtml index 99b3fadbc8..2326fe273e 100644 --- a/resources/views/emails/register-user-text.phtml +++ b/resources/views/emails/register-user-text.phtml @@ -5,6 +5,6 @@ <?= I18N::translate('Follow this link to verify your email address.') ?> -<?= route('verify', ['username' => $user->userName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree->name()], true) ?> +<?= route('verify', ['username' => $user->userName(), 'token' => $user->getPreference('reg_hashcode'), 'ged' => $tree ? $tree->name() : '']) ?> <?= I18N::translate('If you didn’t request an account, you can just delete this message.') ?> |