Increase Minimum requirement to 4.0. The reason is not that 3.5 stopp…

…ed working, but the unit tests did. So continue to use it at your own fancy, but I won't fix it if it breaks. Copyright notice 2019
goranseric · Jan 18, 2019 · a8189dd · a8189dd
1 parent 567d508
commit a8189dd
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 23 deletions.
diff --git a/admin-ui.php b/admin-ui.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/api.php b/api.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/check_requirements.php b/check_requirements.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/data-sources/auto.php b/data-sources/auto.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/data-sources/header.php b/data-sources/header.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/data-sources/manual.php b/data-sources/manual.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/data-sources/precision.php b/data-sources/precision.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/data-sources/registry.php b/data-sources/registry.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/filter.php b/filter.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/geoip-detect-lib.php b/geoip-detect-lib.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/geoip-detect.php b/geoip-detect.php
@@ -5,21 +5,21 @@
 Description:     Retrieving Geo-Information using the Maxmind GeoIP (Lite) Database.
 Author:          Yellow Tree (Benjamin Pick)
 Author URI:      http://www.yellowtree.de
-Version:         2.9.3-beta
+Version:         2.10.0-beta
 License:         GPLv3 or later
 License URI:     http://www.gnu.org/licenses/gpl-3.0.html
 Text Domain:     geoip-detect
 Domain Path:     /languages
 GitHub Plugin URI: https://github.com/yellowtree/geoip-detect
 GitHub Branch:   master
-Requires WP:     3.5
+Requires WP:     4.0
 Requires PHP:    5.4
 */
 
 define('GEOIP_DETECT_VERSION', '2.9.2');
 
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify
@@ -38,6 +38,8 @@
 */
 
 define('GEOIP_REQUIRED_PHP_VERSION', '5.4');
+
+// It should still run in 3.5 . But officially supported is only WP 4.0 and above.
 define('GEOIP_REQUIRED_WP_VERSION', '3.5');
 
 define('GEOIP_PLUGIN_FILE', __FILE__);

diff --git a/legacy-api.php b/legacy-api.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/lib/geonames/generators/geonames.php b/lib/geonames/generators/geonames.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/lib/geonames/geonames-country-info.php b/lib/geonames/geonames-country-info.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/lib/get-client-ip.php b/lib/get-client-ip.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/readme.txt b/readme.txt
@@ -1,7 +1,7 @@
 === GeoIP Detection ===
 Contributors: benjaminpick
 Tags: geoip, maxmind, geolocation, locator
-Requires at least: 3.5
+Requires at least: 4.0
 Tested up to: 5.0
 Requires PHP: 5.4
 Stable tag: trunk
@@ -36,8 +36,9 @@ as a shortcode, or via CSS body classes. The city & country names are translated
 * When enabled on the options page, it adds CSS classes to the body tag such as `geoip-province-HE`, `geoip-country-DE` and `geoip-continent-EU`.
 * When enabled on the options page, the client IP respects a reverse proxy of the server.
 * If you are using [Contact Form 7](https://wordpress.org/plugins/contact-form-7/), you can use these shortcodes:
-  * A select input with all countries, the detected country being selected by default `[geoip_detect2_countries mycountry]`
-  * Tracking information for the email text `[geoip_detect2_user_info]`
+  * A select input with all countries, the detected country being selected by default: `[geoip_detect2_countries mycountry]`
+  * A text input that is pre-filled with the detected city (or other property): `[geoip_detect2_text_input city property:city lang:fr id:id class:class default:Paris]`
+  * GeoIP information for the email text: `[geoip_detect2_user_info]`
 
 See [API Documentation](https://github.com/yellowtree/geoip-detect/wiki/API-Documentation) for more info.
 
@@ -123,6 +124,7 @@ New: Shortcode for showing/hiding content!
 * NEW: Add a ContactForm7-Tag `geoip_detect2_text_input` (see https://github.com/yellowtree/geoip-detect/wiki/API-Documentation#create-a-text-input-that-is-prefilled-with-a-geodetected-property)
 * NEW: A wordpress filter allows overriding of the detected geo-information inside the `geoip_detect2_shortcode_show_if`-Shortcode. Use `geoip_detect2_record_information` instead if you want to override this information for all shortcodes and API calls.
 * Updated Maxmind vendor code.
+* Increased WP minimum version to 4.0
 
 = 2.9.2 =
 * FIX: ContactForm7-Mailtag disabled mailtags from other plugins.

diff --git a/shortcode.php b/shortcode.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/upgrade-plugin.php b/upgrade-plugin.php
@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2013-2018 Yellow Tree, Siegen, Germany
+Copyright 2013-2019 Yellow Tree, Siegen, Germany
 Author: Benjamin Pick (wp-geoip-detect| |posteo.de)
 
 This program is free software; you can redistribute it and/or modify

diff --git a/vendor/geoip2/geoip2/README.md b/vendor/geoip2/geoip2/README.md
@@ -395,7 +395,7 @@ The GeoIP2 PHP API uses [Semantic Versioning](http://semver.org/).
 
 ## Copyright and License ##
 
-This software is Copyright (c) 2013-2018 by MaxMind, Inc.
+This software is Copyright (c) 2013-2019 by MaxMind, Inc.
 
 This is free software, licensed under the Apache License, Version 2.0.