diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-12-12 13:54:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 13:54:03 +0300 |
| commit | 53454e8efd0ab2a03dd9bb9f837aa63f36cfe552 (patch) | |
| tree | be7dc483dad0dcac6577b73e9e82ede7bc097682 /libs/MaxMindGeoIP/geoip.inc | |
| parent | b1c09fa5123155ab9cd79342a4a0cef42e80de7f (diff) | |
| parent | 67f2661f24602a07ebee66172f8446887ab83787 (diff) | |
Merge pull request #10994 from piwik/3.x-dev3.0.0-rc2
3.0.0-rc2 release
Diffstat (limited to 'libs/MaxMindGeoIP/geoip.inc')
| -rwxr-xr-x | libs/MaxMindGeoIP/geoip.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/MaxMindGeoIP/geoip.inc b/libs/MaxMindGeoIP/geoip.inc index 739a4ef987..519e48d373 100755 --- a/libs/MaxMindGeoIP/geoip.inc +++ b/libs/MaxMindGeoIP/geoip.inc @@ -1921,6 +1921,7 @@ function geoip_region_by_addr($gi, $addr) return _get_region($gi, $ipnum); } +if(!function_exists('getdnsattributes')) { function getdnsattributes($l, $ip) { $r = new Net_DNS_Resolver(); @@ -1930,7 +1931,7 @@ function getdnsattributes($l, $ip) $str = substr($str, 1, -1); return $str; } - +} function _safe_substr($string, $start, $length) { // workaround php's broken substr, strpos, etc handling with |