From 72618a23e0d3a4fe126f9d31aa8009b9bc325930 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 25 Aug 2017 10:37:46 -0400
Subject: [PATCH] Release

Fix for member photo upload with location turned off.
---
 index.php                          | 6 +++---
 readme.txt                         | 4 ++++
 views/admin/member/memberInfo.html | 7 ++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/index.php b/index.php
index c8c0c8af..dbfde6fc 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * Plugin Name: GLM Members Database
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media Members Database.
- * Version: 2.10.8
+ * Version: 2.10.9
  * Author: Gaslight Media
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -19,7 +19,7 @@
  * @package glmMembersDatabase
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 2.10.8
+ * @version 2.10.9
  */
 
 // Check that we're being called by WordPress.
@@ -44,7 +44,7 @@ if (!defined('ABSPATH')) {
  *
  */
 
-define('GLM_MEMBERS_PLUGIN_VERSION', '2.10.8');
+define('GLM_MEMBERS_PLUGIN_VERSION', '2.10.9');
 define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.32');
 
 // Check if plugin version is not current in WordPress option and if needed updated it
diff --git a/readme.txt b/readme.txt
index 9f531c13..d2952b46 100644
--- a/readme.txt
+++ b/readme.txt
@@ -66,6 +66,10 @@ There is of course much more to this.
 (none)
 
 == Changelog ==
+= 2.10.9 =
+* Fix issue where the code for google map was being called when locations for
+  members were turned off.
+
 = 2.10.8 =
 * Fixing map issues when loading the map in member edit info page.
 * Fixing undefined references in "File Download" area.
diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index 58be0ac2..0c1d6ee7 100644
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -1,6 +1,5 @@
 {include file='admin/member/header.html'}
 
-
     <script src="//maps.googleapis.com/maps/api/js?&key={$settings.google_maps_api_key}"></script>
     <script type="text/javascript">var enableDraggable = true;</script>
 
@@ -638,7 +637,7 @@
             /*
              * Map Display Toggle
              */
-/*             
+/*
             $("#locationMapToggle").click(function() {
                 var mapC = "#locationMapContainer";
                 var map = "#locationMap";
@@ -708,7 +707,7 @@
                     // Assign it to the lat/lon fields for submission
                     $('#glmLat').val(glmLat.toFixed(6));
                     $('#glmLng').val(glmLng.toFixed(6));
-                    
+
                     glmPageUpdateRequired();
 
                 });
@@ -862,7 +861,9 @@
             checkLiveCamType();
 
             // Initialize map on load
+            {if $settings.memb_info_location}
             initMap();
+            {/if}
 
         });
     </script>
-- 
2.17.1