diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-11-11 20:08:02 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-11-11 20:08:02 +0000 |
| commit | 3d61467f694dfe56443da8492f2fff70e8f9b1f5 (patch) | |
| tree | b446a68cda90159da17529d900a0e81d2e062d71 /resources/views/emails | |
| parent | b3f0586e781c66644b219575ff0c0667227d34ad (diff) | |
| download | webtrees-3d61467f694dfe56443da8492f2fff70e8f9b1f5.tar.gz webtrees-3d61467f694dfe56443da8492f2fff70e8f9b1f5.tar.bz2 webtrees-3d61467f694dfe56443da8492f2fff70e8f9b1f5.zip | |
Fix: missing tree parameter in email verification email
Diffstat (limited to 'resources/views/emails')
| -rw-r--r-- | resources/views/emails/register-user-html.phtml | 5 | ||||
| -rw-r--r-- | resources/views/emails/register-user-text.phtml | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/resources/views/emails/register-user-html.phtml b/resources/views/emails/register-user-html.phtml index 0af32bdb6c..ff0355bad4 100644 --- a/resources/views/emails/register-user-html.phtml +++ b/resources/views/emails/register-user-html.phtml @@ -2,6 +2,7 @@ use Fisharebest\Webtrees\Http\RequestHandlers\VerifyEmail; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\User; ?> @@ -20,8 +21,8 @@ use Fisharebest\Webtrees\User; </p> <p> - <a href="<?= e(route(VerifyEmail::class, ['username' => $user->userName(), 'token' => $user->getPreference(User::PREF_VERIFICATION_TOKEN), 'tree' => $tree ? $tree->name() : ''])) ?>"> - <?= e(route(VerifyEmail::class, ['username' => $user->userName(), 'token' => $user->getPreference(User::PREF_VERIFICATION_TOKEN), 'tree' => $tree ? $tree->name() : ''])) ?> + <a href="<?= e(route(VerifyEmail::class, ['username' => $user->userName(), 'token' => $user->getPreference(User::PREF_VERIFICATION_TOKEN), 'tree' => $tree instanceof Tree ? $tree->name() : null])) ?>"> + <?= e(route(VerifyEmail::class, ['username' => $user->userName(), 'token' => $user->getPreference(User::PREF_VERIFICATION_TOKEN), 'tree' => $tree instanceof Tree ? $tree->name() : null])) ?> </a> </p> diff --git a/resources/views/emails/register-user-text.phtml b/resources/views/emails/register-user-text.phtml index 06bf179089..f7e6a475e4 100644 --- a/resources/views/emails/register-user-text.phtml +++ b/resources/views/emails/register-user-text.phtml @@ -2,6 +2,7 @@ use Fisharebest\Webtrees\Http\RequestHandlers\VerifyEmail; use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\User; ?> @@ -12,6 +13,6 @@ use Fisharebest\Webtrees\User; <?= I18N::translate('Follow this link to verify your email address.') ?> -<?= route(VerifyEmail::class, ['username' => $user->userName(), 'token' => $user->getPreference(User::PREF_VERIFICATION_TOKEN), 'tree' => $tree ? $tree->name() : '']) ?> +<?= route(VerifyEmail::class, ['username' => $user->userName(), 'token' => $user->getPreference(User::PREF_VERIFICATION_TOKEN), 'tree' => $tree instanceof Tree ? $tree->name() : null]) ?> <?= I18N::translate('If you didn’t request an account, you can just delete this message.') ?> |