diff options
| author | Julius Härtl <jus@bitgrid.net> | 2023-02-20 12:36:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-20 12:36:06 +0100 |
| commit | 95eeba83b6570b3cf7cbb79aea42222f7d3e03f4 (patch) | |
| tree | 53add6b43a82e418d0e267d4160f536724e886f6 | |
| parent | 6bb0985e59d7ba3c4cf9928d8bb766ac9975cd12 (diff) | |
| parent | 4cebfa95e68e95afd9f6c038ded32e68b7db1cd2 (diff) | |
| download | nextcloud-server-95eeba83b6570b3cf7cbb79aea42222f7d3e03f4.tar.gz nextcloud-server-95eeba83b6570b3cf7cbb79aea42222f7d3e03f4.zip | |
Merge pull request #36780 from nextcloud/bugfix/noid/console-error-share-auth
| -rw-r--r-- | core/js/publicshareauth.js | 4 | ||||
| -rw-r--r-- | lib/private/Template/CSSResourceLocator.php | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/js/publicshareauth.js b/core/js/publicshareauth.js index 374d7e92e16..3d694c7bfd6 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); + } }); diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php index 5047b3e906f..4ebe054ca7b 100644 --- a/lib/private/Template/CSSResourceLocator.php +++ b/lib/private/Template/CSSResourceLocator.php @@ -43,8 +43,7 @@ class CSSResourceLocator extends ResourceLocator { */ 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; |