mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Fix error in Geoip when REMOTE_ADDR isn't set
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60606 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
300dfa9d07
commit
26f3dc26da
@ -333,7 +333,7 @@ class Geoip extends Object {
|
|||||||
*/
|
*/
|
||||||
static function visitor_country() {
|
static function visitor_country() {
|
||||||
if( ereg('^dev(\\.|$)', $_SERVER['HTTP_HOST']) && isset($_GET['country'])) return $_GET['country'];
|
if( ereg('^dev(\\.|$)', $_SERVER['HTTP_HOST']) && isset($_GET['country'])) return $_GET['country'];
|
||||||
else return Geoip::ip2country($_SERVER['REMOTE_ADDR'], true);
|
else if(isset($_SERVER['REMOTE_ADDR'])) return Geoip::ip2country($_SERVER['REMOTE_ADDR'], true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user