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

Revert "Use composer version of GeoIP library (#12021)" #12293

Merged
merged 1 commit into from Nov 22, 2017
Merged

Conversation

sgiehl
Copy link
Member

@sgiehl sgiehl commented Nov 21, 2017

This reverts commit 23249e9. reverts #12021

We can't use geoip from composer as it conflicts with geoip pecl and there is no way to work around it.
The patched library we used before checked if those methods already exist before defining them...

fixes #12291

@sgiehl sgiehl added Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. labels Nov 21, 2017
@sgiehl sgiehl added this to the 3.2.1 milestone Nov 21, 2017
@sgiehl sgiehl removed the Needs Review PRs that need a code review label Nov 22, 2017
@sgiehl
Copy link
Member Author

sgiehl commented Nov 22, 2017

As this is a simple revert, I'll merge without review

@sgiehl sgiehl merged commit bfc71ad into 3.x-dev Nov 22, 2017
@sgiehl sgiehl deleted the revertgeoip branch November 22, 2017 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[3.2.1-b1] Cannot redeclare geoip_country_code_by_name_v6() when PECL extention is installed
1 participant