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.

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

Move overwritehost check to isTrustedDomain #18184

Merged
merged 1 commit into from
Dec 9, 2019

Conversation

juliusknorr
Copy link
Member

Otherwise the trusted domain check in base.php might succeed while calling isTrustedDomain returns false

@juliusknorr
Copy link
Member Author

/backport to stable17

@juliusknorr
Copy link
Member Author

/backport to stable16

@rullzer
Copy link
Member

rullzer commented Dec 2, 2019

@nickvergessen nickvergessen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Dec 4, 2019
@juliusknorr juliusknorr force-pushed the bugfix/noid/is-trusted-domain branch 2 times, most recently from 2faa50b to 3eb0755 Compare December 6, 2019 12:02
@juliusknorr juliusknorr added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Dec 6, 2019
@juliusknorr
Copy link
Member Author

Let's wait for CI again but I could not see any related failure anymore

Signed-off-by: Julius Härtl <jus@bitgrid.net>
@skjnldsv skjnldsv force-pushed the bugfix/noid/is-trusted-domain branch from 3eb0755 to d05f131 Compare December 7, 2019 08:53
@rullzer rullzer merged commit 7215500 into master Dec 9, 2019
@rullzer rullzer deleted the bugfix/noid/is-trusted-domain branch December 9, 2019 20:37
@backportbot-nextcloud
Copy link

backport to stable17 in #18306

@backportbot-nextcloud
Copy link

backport to stable16 in #18308

@rullzer rullzer mentioned this pull request Dec 11, 2019
43 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants