tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Trac #1533: Fixed Geoip::ip2country() to use user_error() instead of trigger_error() (standard practice, even though user_error()

Browse Source 
is just an alias of trigger_error()) and made it raise an appropriate error (E_USER_NOTICE)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43875 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Matt Peel 2007-10-26 02:09:34 +00:00
parent 0f24930ccf
commit 7d0ddb9d33
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/Geoip.php
View File

@ -289,12 +289,12 @@ class Geoip extends Object {
// Note: At time of writing, $result is always zero for this program // Note: At time of writing, $result is always zero for this program
if ($code == 127) { if ($code == 127) {
trigger_error("ip2country($address) cannot find or run geoiplookup executable.", E_trigger_error); user_error("ip2country($address) cannot find or run geoiplookup executable.", E_USER_NOTICE);
return false; return false;
} }
if ($result == false) { if ($result == false) {
trigger_error("ip2country($address): geoiplookup executable returned nothing.", E_trigger_error); user_error("ip2country($address): geoiplookup executable returned nothing.", E_USER_NOTICE);
return false; return false;
} }