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

[5.6] remove full baseUrl from generated url paths (follow up) #24101

Merged
merged 3 commits into from May 4, 2018

Conversation

Projects
None yet
2 participants
@tomschlick
Contributor

tomschlick commented May 3, 2018

This is a follow up to #24074 to fix cases where the current url contains a prefix (like /subfolder/index.php). The previous PR only fixed /subfolder.

Instead of using the request()->getBasePath() method it now uses request()->getBaseUrl(). That should take care of all cases.

Tests have been updated to reflect that change and two more were added to check all possible types of prefixes (/subfolder, /subfolder/index.php, other.php).

Sorry for not catching this in the original PR!

tomschlick added some commits May 3, 2018

@taylorotwell taylorotwell merged commit 1fc6cd5 into laravel:5.6 May 4, 2018

2 checks passed

continuous-integration/styleci/pr The analysis has passed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@tomschlick tomschlick deleted the tomschlick:patch-2 branch May 4, 2018

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