Upgrade to 3.6.0

2021-11-16 14:53:37 +01:00
parent 7388fa4d24
commit 92b7a330fa
318 changed files with 20017 additions and 6878 deletions
--- a/kirby/config/templates/emails/auth/login.php
+++ b/kirby/config/templates/emails/auth/login.php
@@ -1,8 +1,16 @@
 <?php

+use Kirby\Toolkit\I18n;
+
 /**
 * @var \Kirby\Cms\User $user
+ * @var string $site
 * @var string $code
 * @var int $timeout
 */
-echo I18n::template('login.email.login.body', null, compact('user', 'code', 'timeout'), $user->language());
+echo I18n::template(
+    'login.email.login.body',
+    null,
+    compact('user', 'site', 'code', 'timeout'),
+    $user->language()
+);