From f3d3dfa075ced44622b5a84387d95281def3b5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 20 Feb 2023 09:17:15 +0100 Subject: [PATCH 1/2] fix: Avoid throwing errors on public auth page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- core/js/publicshareauth.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/js/publicshareauth.js b/core/js/publicshareauth.js index 374d7e92e16a1..3d694c7bfd6aa 100644 --- a/core/js/publicshareauth.js +++ b/core/js/publicshareauth.js @@ -47,6 +47,8 @@ document.addEventListener('DOMContentLoaded', function() { // Adds functionality to the request password button var passwordRequestButton = document.getElementById('request-password-button-not-talk'); - passwordRequestButton.addEventListener('click', showEmailAddressPromptForm); + if (passwordRequestButton) { + passwordRequestButton.addEventListener('click', showEmailAddressPromptForm); + } }); From 4cebfa95e68e95afd9f6c038ded32e68b7db1cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 20 Feb 2023 09:28:30 +0100 Subject: [PATCH 2/2] fix: Fix loading styles from core/css/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/private/Template/CSSResourceLocator.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php index 5047b3e906f82..4ebe054ca7b4b 100644 --- a/lib/private/Template/CSSResourceLocator.php +++ b/lib/private/Template/CSSResourceLocator.php @@ -43,8 +43,7 @@ public function __construct(LoggerInterface $logger) { */ public function doFind($style) { $app = substr($style, 0, strpos($style, '/')); - if (strpos($style, '3rdparty') === 0 - && $this->appendIfExist($this->serverroot, $style.'.css') + if ($this->appendIfExist($this->serverroot, $style.'.css') || $this->appendIfExist($this->serverroot, 'core/'.$style.'.css') ) { return;