Skip to content

Commit

Permalink
Merge pull request #36780 from nextcloud/bugfix/noid/console-error-sh…
Browse files Browse the repository at this point in the history
…are-auth
  • Loading branch information
juliusknorr authored Feb 20, 2023
2 parents 6bb0985 + 4cebfa9 commit 95eeba8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 3 additions & 1 deletion core/js/publicshareauth.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

});
3 changes: 1 addition & 2 deletions lib/private/Template/CSSResourceLocator.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 95eeba8

Please sign in to comment.