Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Avoid throwing errors on public auth page #36780

Merged
merged 2 commits into from
Feb 20, 2023
Merged

fix: Avoid throwing errors on public auth page #36780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3d3dfa
fix: Avoid throwing errors on public auth page
juliusknorr Feb 20, 2023
4cebfa9
fix: Fix loading styles from core/css/
juliusknorr Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion core/js/publicshareauth.js
View file
Open in desktop
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
View file
Open in desktop
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
artonge marked this conversation as resolved.
Show resolved Hide resolved
&& $this->appendIfExist($this->serverroot, $style.'.css')
if ($this->appendIfExist($this->serverroot, $style.'.css')
|| $this->appendIfExist($this->serverroot, 'core/'.$style.'.css')
) {
return;
Expand Down