Merge pull request #36780 from nextcloud/bugfix/noid/console-error-share-auth

pull/36661/head
Julius Härtl 2 years ago committed by GitHub
commit 95eeba83b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      core/js/publicshareauth.js
  2. 3
      lib/private/Template/CSSResourceLocator.php

@ -47,6 +47,8 @@ document.addEventListener('DOMContentLoaded', function() {
// Adds functionality to the request password button
var passwordRequestButton = document.getElementById('request-password-button-not-talk');
if (passwordRequestButton) {
passwordRequestButton.addEventListener('click', showEmailAddressPromptForm);
}
});

@ -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;

Loading…
Cancel
Save