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:
authorbenakamoorthi <benaka.moorthi@gmail.com>2012-10-23 05:45:50 +0400
committerbenakamoorthi <benaka.moorthi@gmail.com>2012-10-23 05:45:50 +0400
commitd4a3345d1402f145eb43b3339293a0665846ad64 (patch)
treecd2bdcb9db09feb799c813eb440e7f5bf2239b73 /plugins/UserCountry
parentba1b3084b2a1e3ffea0b9cafe8ed5e167571f07e (diff)
Refs #1823, do broken check w/ both GEOIP_ADDR & GEOIP_COUNTRY_CODE.
git-svn-id: http://dev.piwik.org/svn/trunk@7281 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/UserCountry')
-rwxr-xr-xplugins/UserCountry/LocationProvider/GeoIp/ServerBased.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
index 7b5b83537d..105d19e077 100755
--- a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
+++ b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
@@ -163,7 +163,8 @@ class Piwik_UserCountry_LocationProvider_GeoIp_ServerBased extends Piwik_UserCou
*/
public function isWorking()
{
- if (empty($_SERVER[self::TEST_SERVER_VAR]))
+ if (empty($_SERVER[self::TEST_SERVER_VAR])
+ && empty($_SERVER[self::TEST_SERVER_VAR_ALT]))
{
return Piwik_Translate("UserCountry_CannotFindGeoIPServerVar", self::TEST_SERVER_VAR.' $_SERVER');
}