From bf9888870c0934de1c8c2d0093ff3520035b1da3 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 2 Dec 2020 21:56:55 +0100 Subject: [PATCH] Fix vsprint parameter %2\$; is not valid. On php7 this is just ignored but on php8 it gives an error. %2\$s; works. Signed-off-by: Roeland Jago Douma --- lib/private/Mail/EMailTemplate.php | 2 +- tests/data/emails/new-account-email-single-button.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index e91c1208cc..df99ece0de 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -290,7 +290,7 @@ EOF; - diff --git a/tests/data/emails/new-account-email-single-button.html b/tests/data/emails/new-account-email-single-button.html index 13e0c036c3..52df334477 100644 --- a/tests/data/emails/new-account-email-single-button.html +++ b/tests/data/emails/new-account-email-single-button.html @@ -112,7 +112,7 @@
+ %7\$s
-
+ Set your password