Merge pull request #35 from maxmind/greg/fix-exact-false-check

Do not use false-y value as an object. Closes #34.
maxmind · Jan 29, 2016 · 56134ce · 56134ce
2 parents 7566233 + 48dcb95
commit 56134ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/geoip.inc b/src/geoip.inc
@@ -1635,7 +1635,7 @@ function geoip_country_code_by_addr($gi, $addr)
 {
     if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
         $record = geoip_record_by_addr($gi, $addr);
-        if ($record !== false) {
+        if ($record) {
             return $record->country_code;
         }
     } else {

diff --git a/tests/CityTest.php b/tests/CityTest.php
@@ -30,5 +30,10 @@ public function testCity()
             'America/Los_Angeles',
             get_time_zone($record->country_code, $record->region)
         );
+
+        $this->assertEquals(
+            'US',
+            geoip_country_code_by_addr($gi, "64.17.254.216")
+        );
     }
 }