From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 27 Apr 2017 18:24:25 +0000 (-0400)
Subject: Reversed test for use of location tab with fields in selected data. That should not... 
X-Git-Tag: v2.9.15^2~3
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=321d79e6ab328c53d0d2557dd14e4c67bf25689c;p=WP-Plugins%2Fglm-member-db.git

Reversed test for use of location tab with fields in selected data. That should not have been added here.
---

diff --git a/classes/data/dataMemberInfo.php b/classes/data/dataMemberInfo.php
index a889b3d5..41a5d30f 100644
--- a/classes/data/dataMemberInfo.php
+++ b/classes/data/dataMemberInfo.php
@@ -792,24 +792,24 @@ class GlmDataMemberInfo extends GlmDataAbstract
             'status' => $f['status'],
             'create_time' => $f['create_time'],
             'modify_time' => $f['modify_time'],
-            'lat' => ($this->config['settings']['memb_info_location'] && isset($v['lat']) ? $v['lat'] : ''),
-            'lon' => ($this->config['settings']['memb_info_location'] && isset($v['lon']) ? $v['lon'] : '')
+            'lat' => $f['lat'],
+            'lon' => $f['lon']
         );
 
         if ($forMapItems) {
             $this->fields = array_merge($this->fields, array(
                 'addr1'         => $f['addr1'],
                 'addr2'         => $f['addr2'],
-                'city'          => ($this->config['settings']['memb_info_location'] && isset($v['city']) ? $v['city'] : ''),
+                'city'          => $f['city'],
                 'state'         => $f['state'],
                 'country'       => $f['country'],
                 'zip'           => $f['zip'],
-                'phone'         => ($this->config['settings']['memb_info_contact'] && isset($v['phone']) ? $v['phone'] : ''),
-                'toll_free'     => ($this->config['settings']['memb_info_contact'] && isset($v['toll_free']) ? $v['toll_free'] : ''),
+                'phone'         => $f['phone'],
+                'toll_free'     => $f['toll_free'],
                 'email'         => $f['email'],
                 'url'           => $f['url'],
-                'region'        => ($this->config['settings']['memb_info_location'] && isset($v['region']) ? $v['region'] : ''),
-                'county'        => ($this->config['settings']['memb_info_location'] && isset($v['country']) ? $v['country'] : ''),
+                'region'        => $f['region'],
+                'country'       => $f['country'],
                 'cc_type'       => $f['cc_type'],
                 'logo'          => $f['logo'],
                 'descr'         => $f['descr'],