Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/UserCountry/LocationProvider.php')
-rwxr-xr-xplugins/UserCountry/LocationProvider.php9
1 files changed, 3 insertions, 6 deletions
diff --git a/plugins/UserCountry/LocationProvider.php b/plugins/UserCountry/LocationProvider.php
index 2c431565e5..a5a656c42f 100755
--- a/plugins/UserCountry/LocationProvider.php
+++ b/plugins/UserCountry/LocationProvider.php
@@ -444,7 +444,8 @@ abstract class LocationProvider
/**
* Returns an IP address from an array that was passed into getLocation. This
- * will return an IPv4 address or IPv6 address.
+ * will return an IPv4 address or null if the address is IPv6 (IPv6 is not
+ * supported yet).
*
* @param array $info Must have 'ip' key.
* @return string|null
@@ -453,11 +454,7 @@ abstract class LocationProvider
{
$ip = \Piwik\Network\IP::fromStringIP($info['ip']);
- if ($ip instanceof \Piwik\Network\IPv6 && $ip->isMappedIPv4()) {
- return $ip->toIPv4String();
- } else {
- return $ip->toString();
- }
+ return $ip->toIPv4String();
}
}