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

FIX: dev/build not flushing manifests if site is in a subfolder #3815

Merged
merged 1 commit into from Feb 11, 2015

Conversation

kinglozzer
Copy link
Member

For example: http://localhost/silverstripe/dev/build would result in $requestURL being silverstripe/dev/build, but BASE_URL . '/dev/build' would be /silverstripe/dev/build (note leading slash).

@dhensby
Copy link
Contributor

dhensby commented Jan 22, 2015

Is this unit-testable?

@kinglozzer
Copy link
Member Author

Not sure, I have no idea how you’d approach testing something like this!

@kinglozzer kinglozzer added the 3.1 label Jan 27, 2015
@kinglozzer kinglozzer added this to the 3.1.10 milestone Jan 27, 2015
@kinglozzer
Copy link
Member Author

Bump :)

@dhensby
Copy link
Contributor

dhensby commented Feb 11, 2015

On sites not in a subdir, wouldn't the BASE_URL be an empty string? if so, the 2nd of the 3 conditions is redundant, no?

@kinglozzer
Copy link
Member Author

@dhensby Good spot, I’ve removed that redundant check now

@dhensby
Copy link
Contributor

dhensby commented Feb 11, 2015

Ok, have you tested this manually to ensure it works as expected?

@dhensby
Copy link
Contributor

dhensby commented Feb 11, 2015

I do find this quite a hacky solution, don't the other dev functions need this kind of fix too?

@kinglozzer
Copy link
Member Author

Yep, I’ve tested both in and not in a subdirectory, with and without trailing slashes and it works as expected.

It does feel hacky, but I’m just trying to fix a regression from #3677 rather than refactor anything :)

@dhensby
Copy link
Contributor

dhensby commented Feb 11, 2015

agreed

dhensby added a commit that referenced this pull request Feb 11, 2015
FIX: dev/build not flushing manifests if site is in a subfolder
@dhensby dhensby merged commit f8fe4a9 into silverstripe:3.1 Feb 11, 2015
@kinglozzer kinglozzer deleted the dev-build-subdir branch July 22, 2015 16:24
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.

None yet

2 participants