From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 16 Apr 2020 08:58:46 +0000 (+0200)
Subject: Merge branch 'develop' of https://github.com/lambacck/awstats into
X-Git-Tag: AWSTATS_7_8~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3357f7d86134f18bdb11a18a7b2def35c633d23c;p=thirdparty%2FAWStats.git

Merge branch 'develop' of https://github.com/lambacck/awstats into
lambacck-develop

# Conflicts:
#	wwwroot/cgi-bin/plugins/geoip2_country.pm
---

3357f7d86134f18bdb11a18a7b2def35c633d23c
diff --cc wwwroot/cgi-bin/plugins/geoip2_country.pm
index 70a0c381,b7f7533f..85f0e29b
--- a/wwwroot/cgi-bin/plugins/geoip2_country.pm
+++ b/wwwroot/cgi-bin/plugins/geoip2_country.pm
@@@ -142,8 -142,8 +142,7 @@@ sub ShowInfoHost_geoip2_country 
          print "</th>";
  	}
  	elsif ($param) {
- 		print "<td>";
- 		my $res = Lookup_geoip2($param);
 -        print "<td>";
+ 		my $res = Lookup_geoip2_country($param);
  		if ($res) {
  				$res = lc($res);
  				print $DomainsHashIDLib{$res}?$DomainsHashIDLib{$res}:"<span style=\"color: #$color_other\">$Message[0]</span>";