Skip to content

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

Merged
taylorotwell merged 3 commits into
laravel:5.6from
tomschlick:patch-2
May 4, 2018
Merged

[5.6] remove full baseUrl from generated url paths (follow up)#24101
taylorotwell merged 3 commits into
laravel:5.6from
tomschlick:patch-2

Conversation

@tomschlick

Copy link
Copy Markdown
Contributor

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!

@taylorotwell
taylorotwell merged commit 1fc6cd5 into laravel:5.6 May 4, 2018
@tomschlick
tomschlick deleted the patch-2 branch May 4, 2018 20:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants