From 900baba30326209093b48c83f9b5aa4b52443c14 Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Mon, 18 Aug 2008 03:13:40 +0000 Subject: [PATCH] BUGFIX: #1458 - GEOIP now does not return any error if it cannot look up the ip address (as it uses a shell command this is not enabled on many WAMP systems) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60920 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- integration/Geoip.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/integration/Geoip.php b/integration/Geoip.php index 6207242ae..ca633fabb 100755 --- a/integration/Geoip.php +++ b/integration/Geoip.php @@ -297,7 +297,8 @@ class Geoip extends Object { } if ($result == false) { - user_error("ip2country($address): geoiplookup executable returned nothing.", E_USER_NOTICE); + // don't return any error - @see http://open.silverstripe.com/ticket/1458 + //user_error("ip2country($address): geoiplookup executable returned nothing.", E_USER_NOTICE); return false; }