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

UnifiedSearchController: strip webroot from URL before finding a route #28303

Merged
merged 2 commits into from
Aug 16, 2021

Conversation

mejo-
Copy link
Member

@mejo- mejo- commented Aug 3, 2021

This should fix route matching in UnifiedSearchController on setups with
Nextcloud in a subfolder (webroot).

Fixes: #24144
Signed-off-by: Jonas Meurer [email protected]

Copy link
Contributor

@kesselb kesselb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks 👍

core/Controller/UnifiedSearchController.php Outdated Show resolved Hide resolved
@mejo- mejo- force-pushed the fix/unifiedsearchcontroller_webroot branch from f39e7f6 to 5e85577 Compare August 3, 2021 21:15
@mejo- mejo- requested a review from kesselb August 3, 2021 21:35
@mejo- mejo- added the 3. to review Waiting for reviews label Aug 3, 2021
@mejo- mejo- force-pushed the fix/unifiedsearchcontroller_webroot branch from 5e85577 to 5986863 Compare August 4, 2021 15:19
Copy link
Member

@juliusknorr juliusknorr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense 👍

@mejo- mejo- force-pushed the fix/unifiedsearchcontroller_webroot branch from 5986863 to 1fa67dc Compare August 6, 2021 09:34
@skjnldsv skjnldsv added 2. developing Work in progress bug feature: search and removed 3. to review Waiting for reviews labels Aug 9, 2021
@mejo- mejo- force-pushed the fix/unifiedsearchcontroller_webroot branch 4 times, most recently from 36cb050 to 02d9297 Compare August 10, 2021 16:40
core/Controller/UnifiedSearchController.php Outdated Show resolved Hide resolved
lib/public/IURLGenerator.php Outdated Show resolved Hide resolved
This should fix route matching in UnifiedSearchController on setups with
Nextcloud in a subfolder (webroot).

Fixes: #24144
Signed-off-by: Jonas Meurer <[email protected]>
@mejo- mejo- force-pushed the fix/unifiedsearchcontroller_webroot branch from 02d9297 to 7c76e85 Compare August 16, 2021 08:57
@mejo-
Copy link
Member Author

mejo- commented Aug 16, 2021

Thanks for your comments @ChristophWurst! I applied all your suggested changes 😊

@juliusknorr juliusknorr merged commit 5da4227 into master Aug 16, 2021
@juliusknorr juliusknorr deleted the fix/unifiedsearchcontroller_webroot branch August 16, 2021 12:37
@juliusknorr
Copy link
Member

/backport to stable22

@juliusknorr
Copy link
Member

/backport to stable21

@juliusknorr
Copy link
Member

/backport to stable20

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

function findMatchingRoute doesn't support nextcloud hosted in subdirectory
5 participants