From c804bf384ad543b629e1a6d6b18929d7cf4a3b9c Mon Sep 17 00:00:00 2001
From: Brian Miyaji <brian@themeboy.com>
Date: Thu, 13 Jun 2019 21:49:38 +1000
Subject: [PATCH] Tag version 2.6.18

---
 changelog.txt                               | 3 +++
 modules/sportspress-default-nationality.php | 6 +++---
 readme.txt                                  | 5 ++++-
 sportspress.php                             | 6 +++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index fbf89c7d..b1e66f34 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,8 @@
 == SportsPress Changelog ==
 
+= 2.6.18 =
+* Fix - Prevent OpenStreetMap scripts from loading when Google Maps is active via SportsPress Pro.
+
 = 2.6.17 =
 * Tweak - Only show welcome screen on major version upgrade.
 * Tweak - Add filters to enable career totals calculation with extensions.
diff --git a/modules/sportspress-default-nationality.php b/modules/sportspress-default-nationality.php
index c2213f47..a7ce111b 100644
--- a/modules/sportspress-default-nationality.php
+++ b/modules/sportspress-default-nationality.php
@@ -5,7 +5,7 @@ Plugin URI: http://themeboy.com/
 Description: Add default nationality option to SportsPress Settings.
 Author: ThemeBoy
 Author URI: http://themeboy.com/
-Version: 2.6.9
+Version: 2.6.18
 */
 
 // Exit if accessed directly
@@ -17,7 +17,7 @@ if ( ! class_exists( 'SportsPress_Default_Nationality' ) ) :
  * Main SportsPress Default Nationality Class
  *
  * @class SportsPress_Default_Nationality
- * @version	2.6.9
+ * @version	2.6.18
  */
 class SportsPress_Default_Nationality {
 
@@ -36,7 +36,7 @@ class SportsPress_Default_Nationality {
 	*/
 	private function define_constants() {
 		if ( !defined( 'SP_DEFAULT_NATIONALITY_VERSION' ) )
-			define( 'SP_DEFAULT_NATIONALITY_VERSION', '2.6.9' );
+			define( 'SP_DEFAULT_NATIONALITY_VERSION', '2.6.18' );
 
 		if ( !defined( 'SP_DEFAULT_NATIONALITY_URL' ) )
 			define( 'SP_DEFAULT_NATIONALITY_URL', plugin_dir_url( __FILE__ ) );
diff --git a/readme.txt b/readme.txt
index 6bcaf30c..d8688fa3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: calendars, club, club management, esports, events, fixtures, leagues, leag
 Donate link: http://tboy.co/donate
 Requires at least: 3.8
 Tested up to: 5.2
-Stable tag: 2.6.17
+Stable tag: 2.6.18
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -237,6 +237,9 @@ When you upgrade to one of the SportsPress Pro licenses, you can simply activate
 
 == Changelog ==
 
+= 2.6.18 =
+* Fix - Prevent OpenStreetMap scripts from loading when Google Maps is active via SportsPress Pro.
+
 = 2.6.17 =
 * Tweak - Only show welcome screen on major version upgrade.
 * Tweak - Add filters to enable career totals calculation with extensions.
diff --git a/sportspress.php b/sportspress.php
index 1c23d443..b512ecc3 100644
--- a/sportspress.php
+++ b/sportspress.php
@@ -3,7 +3,7 @@
  * Plugin Name: SportsPress
  * Plugin URI: http://themeboy.com/sportspress/
  * Description: Manage your club and its players, staff, events, league tables, and player lists.
- * Version: 2.6.17
+ * Version: 2.6.18
  * Author: ThemeBoy
  * Author URI: http://themeboy.com
  * Requires at least: 3.8
@@ -26,14 +26,14 @@ if ( ! class_exists( 'SportsPress' ) ) :
  * Main SportsPress Class
  *
  * @class SportsPress
- * @version	2.6.17
+ * @version	2.6.18
  */
 final class SportsPress {
 
 	/**
 	 * @var string
 	 */
-	public $version = '2.6.17';
+	public $version = '2.6.18';
 
 	/**
 	 * @var SportsPress The single instance of the class