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

Amend path resolution handlers and outside root check conditional in FileSystemLoader #775

Merged
merged 1 commit into from
Aug 31, 2016

Conversation

robfrawley
Copy link
Collaborator

@robfrawley robfrawley commented Aug 25, 2016

Fixes #763 by allowing "../" in both root and asset paths. Loading assets is still "chrooted" within the root path using a simple (and quick!) strpos check.

Test included!

@robfrawley robfrawley changed the title Amend path resolution handlers and outside root check conditional Amend path resolution handlers and outside root check conditional in FileSystemLoader Aug 25, 2016
@robfrawley
Copy link
Collaborator Author

So... Any thoughts from @deciders?

@lsmith77
Copy link
Contributor

looks good to me ..

@lsmith77 lsmith77 merged commit 9246fd2 into liip:master Aug 31, 2016
lsmith77 added a commit that referenced this pull request Sep 6, 2016
@robfrawley robfrawley deleted the bugfix-763 branch January 9, 2017 21:11
@alexwilson alexwilson mentioned this pull request Jan 11, 2017
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