From 74462459a6281125408afb1ef63e3fcaa2cccd3d Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Fri, 29 Jan 2016 09:14:33 -0800 Subject: [PATCH] Prepare for 1.16 --- ChangeLog.md | 8 +++++++- README.md | 4 ++-- src/geoipregionvars.php | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 96649c9..965a31a 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,11 @@ # Change Log # +## 1.16 (2016-01-29) + +* Fixed issue that could cause a notice about using a property on a non-object + when calling `geoip_record_by_addr()` on a City database. Reported by + Justinas Rakašis. GitHub #34. + ## 1.15 (2015-05-01) * Calls to `die()` where replaced with calls to `trigger_error()`. This @@ -126,7 +132,7 @@ * Changed license from GPL to LGPL so code can be included in PEAR * added global definitions to prevent undefined variables error when including - from function (Cédric Dufour) + from function (CĂ©dric Dufour) * Updated country names * Added support for GeoIP City, version 1 with DMA and Area codes diff --git a/README.md b/README.md index e9dbfcd..b1f4ce1 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ You should now have the file `composer.phar` in your project directory. Run in your project root: ``` -php composer.phar require geoip/geoip:~1.14 +php composer.phar require geoip/geoip:~1.16 ``` You should now have the files `composer.json` and `composer.lock` as well as @@ -88,7 +88,7 @@ For help with this API or our databases, please see [our support page] ## Copyright and License ## -This software is Copyright (c) 2014 by MaxMind, Inc. +This software is Copyright (c) 2016 by MaxMind, Inc. This is free software, licensed under the GNU Lesser General Public License version 2.1 or later. diff --git a/src/geoipregionvars.php b/src/geoipregionvars.php index f57013f..1a8c777 100644 --- a/src/geoipregionvars.php +++ b/src/geoipregionvars.php @@ -1,5 +1,5 @@