From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 25 Oct 2019 14:16:04 +0000 (-0400)
Subject: Merge branch 'develop' into feature/LoggingUserActivity
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3718fb6810507a3218f8b07d29f4142b926e663b;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'develop' into feature/LoggingUserActivity
---

3718fb6810507a3218f8b07d29f4142b926e663b
diff --cc classes/data/dataMemberInfo.php
index 28bb4467,b71cbf78..29078a1a
--- a/classes/data/dataMemberInfo.php
+++ b/classes/data/dataMemberInfo.php
@@@ -695,21 -686,16 +686,20 @@@ class GlmDataMemberInfo extends GlmData
                  $this->wpdb->prepare(
                      "SELECT *
                         FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "accommodations
 -                      WHERE ref_dest = %d", $r['id'] ), ARRAY_A );
 +                      WHERE ref_dest = %d",
 +                    $r['id']
 +                ),
 +                ARRAY_A
 +            );
              if ( $accommodationData ) {
                  $r['accommodations'] = true;
-                 $r['num_rooms']      = $accommodationData['num_rooms'];
-                 $r['year_round']     = $accommodationData['year_round'];
+                 $r['num_rooms'] = $accommodationData['num_rooms'];
+                 $r['year_round'] = $accommodationData['year_round'];
              } else {
                  $r['accommodations'] = false;
-                 $r['num_rooms']      = false;
-                 $r['year_round']     = false;
+                 $r['num_rooms'] = false;
+                 $r['year_round'] = false;
              }
- 
          }
  
          return $r;