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

add constant PIWIK_VENDOR_PATH #8227

Merged
merged 1 commit into from Jul 6, 2015
Merged

Conversation

craue
Copy link
Contributor

@craue craue commented Jun 26, 2015

Instead of PIWIK_INCLUDE_PATH . '/vendor/...', now PIWIK_VENDOR_PATH . '/...' should be used. The new constant PIWIK_VENDOR_PATH points directly to the vendor dir.

This is an approach to avoid (future) issues with files not being found when Piwik is installed as a Composer dependency. See #173 and #8226.

I just searched the repo for vendor and tried to replace it when possible, although there's some code I decided to leave untouched for now to avoid accidentally breaking it. E.g. in core/Profiler.php there's one line which could be changed easily but also one line creating a URL based on the path. So please review the changes carefully and let me know if there's something wrong or missing.

@mattab
Copy link
Member

mattab commented Jul 6, 2015

Thanks @craue, looks good!

mattab pushed a commit that referenced this pull request Jul 6, 2015
@mattab mattab merged commit a1d229c into matomo-org:master Jul 6, 2015
@mattab mattab added this to the 2.14.0 milestone Jul 6, 2015
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