diff options
| author | sgiehl <stefan@piwik.org> | 2017-11-21 21:28:08 +0300 |
|---|---|---|
| committer | Stefan Giehl <stefan@piwik.org> | 2017-11-22 23:24:52 +0300 |
| commit | bfc71ad6468737edf3c11093cb4d24735299f228 (patch) | |
| tree | 045d8e47f77fd3426d18e78203c0643914c2b886 /plugins | |
| parent | d6dea0a51d4dee03a2a324a8eebcb93880ca3213 (diff) | |
Revert "Use composer version of GeoIP library (#12021)"
This reverts commit 23249e9eec85350e7464eac3ec90450b2614e3c7.
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/UserCountry/LocationProvider/GeoIp.php | 4 | ||||
| -rwxr-xr-x | plugins/UserCountry/LocationProvider/GeoIp/Php.php | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/UserCountry/LocationProvider/GeoIp.php b/plugins/UserCountry/LocationProvider/GeoIp.php index 3fd9fad12e..247ae6035a 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp.php +++ b/plugins/UserCountry/LocationProvider/GeoIp.php @@ -160,8 +160,8 @@ abstract class GeoIp extends LocationProvider public static function getRegionNames() { if (is_null(self::$regionNames)) { - global $GEOIP_REGION_NAME; - require_once PIWIK_INCLUDE_PATH . '/vendor/geoip/geoip/src/geoipregionvars.php'; + $GEOIP_REGION_NAME = array(); + require_once PIWIK_INCLUDE_PATH . '/libs/MaxMindGeoIP/geoipregionvars.php'; self::$regionNames = $GEOIP_REGION_NAME; } diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Php.php b/plugins/UserCountry/LocationProvider/GeoIp/Php.php index ecc602165d..35c505f7b9 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/Php.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/Php.php @@ -369,6 +369,7 @@ class Php extends GeoIp if (empty($this->geoIpCache[$key])) { // make sure region names are loaded & saved first parent::getRegionNames(); + require_once PIWIK_INCLUDE_PATH . '/libs/MaxMindGeoIP/geoipcity.inc'; $pathToDb = self::getPathToGeoIpDatabase($this->customDbNames[$key]); if ($pathToDb !== false) { |