From: John Molakvoæ <skjnldsv@protonmail.com>
Date: Fri, 15 Apr 2022 08:28:54 +0000 (+0200)
Subject: Fix twofactor loading and public image
X-Git-Tag: v25.0.0beta1~535^2~11
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fa18a77fa24ad01944d79232fb637076282dedc2;p=nextcloud-server.git

Fix twofactor loading and public image

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
---

diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index e8f6bd430d3..1cd269f9bff 100644
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -272,6 +272,7 @@ class ThemingController extends Controller {
 	/**
 	 * @PublicPage
 	 * @NoCSRFRequired
+	 * @NoSameSiteCookieRequired
 	 *
 	 * @param string $key
 	 * @param bool $useSvg
@@ -304,6 +305,7 @@ class ThemingController extends Controller {
 	 * @NoCSRFRequired
 	 * @PublicPage
 	 * @NoSameSiteCookieRequired
+	 * @NoTwoFactorRequired
 	 *
 	 * @return FileDisplayResponse|NotFoundResponse
 	 */
diff --git a/core/css/guest.css b/core/css/guest.css
index f10ac8fe15c..b4af600ecd8 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -23,8 +23,7 @@ body {
 	color: var(--color-primary-text);
 	text-align: center;
 	background-color: var(--color-primary);
-	background-image: var(--image-background);
-	background-image: var(--image-background), linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-light) 100%);
+	background-image: var(--image-background, var(--image-background-plain, url('../../../core/img/background.svg'), linear-gradient(40deg, #0082c9 0%, #30b6ff 100%)));
 	background-position: 50% 50%;
 	background-repeat: repeat;
 	background-size: var(--image-background-size, 275px, contain);