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 fatal error in case users still using first geoip plugin. #15362

Merged
merged 2 commits into from Jan 9, 2020

Conversation

diosmosis
Copy link
Member

Fixes #15359

@diosmosis diosmosis added the not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. label Jan 8, 2020
@diosmosis diosmosis added this to the 3.13.1 milestone Jan 8, 2020
@@ -2,7 +2,7 @@
<p>
{{ 'UserCountry_GeoIPUpdaterInstructions'|translate('<a href="http://www.maxmind.com/?rId=piwik">','</a>','<a rel="noreferrer noopener" href="https://db-ip.com/?refid=mtm">','</a>')|raw }}
<br/><br/>
{{ 'UserCountry_GeoLiteCityLink'|translate("<a href='"~dbipLiteUrl~"'>",dbipLiteUrl,'</a>')|raw }}
{% if dbipLiteUrl|default is not empty %}{{ 'UserCountry_GeoLiteCityLink'|translate("<a href='"~dbipLiteUrl~"'>",dbipLiteUrl,'</a>')|raw }}{% endif %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@diosmosis any chance to escape the URLs?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

@diosmosis
Copy link
Member Author

@tsteur fyi merging since tests passed, let me know if there are other changes

@diosmosis diosmosis merged commit bd3210b into 3.x-dev Jan 9, 2020
@diosmosis diosmosis deleted the geoip-one-fatal-error branch January 9, 2020 01:57
jonasgrilleres pushed a commit to 1024pix/pix-analytics that referenced this pull request Sep 22, 2020
…-org#15362)

* Fix fatal error in case users still using first geoip plugin.

* escape urls.
jbuget pushed a commit to 1024pix/pix-analytics that referenced this pull request Sep 26, 2020
…-org#15362)

* Fix fatal error in case users still using first geoip plugin.

* escape urls.
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.

Fatal Error : Variable "dbipLiteUrl" does not exist.
2 participants