From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 20 Mar 2018 19:27:53 +0000 (-0400)
Subject: Merge branch 'develop' into customFields
X-Git-Tag: v1.1.12^2~34
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=02393e02833f6027d0d8b9017a7de1a7f15ba88f;p=WP-Plugins%2Fglm-member-db-contacts.git

Merge branch 'develop' into customFields
---

02393e02833f6027d0d8b9017a7de1a7f15ba88f
diff --cc models/admin/contacts/index.php
index 9d295fd,c765882..aa5419b
--- a/models/admin/contacts/index.php
+++ b/models/admin/contacts/index.php
@@@ -98,45 -98,43 +98,44 @@@ class GlmMembersAdmin_contacts_index ex
      public function modelAction($actionData = false)
      {
  
-         $view = 'index.html';
-         $option = 'list';
-         $fromMemberMenu = false;
-         $loggedInMember = false;
-         $refType = false;
-         $refTypeName = false;
-         $haveMember = false;
-         $this->memberID = false;
-         $memberData = false;
-         $memberName = false;
-         $membersList = false;
-         $contactsList = false;
-         $haveContacts = false;
-         $contactID = false;
-         $contactInfo = false;
-         $newContactEmailExists = false;
+         $view                     = 'index.html';
+         $option                   = 'list';
+         $fromMemberMenu           = false;
+         $loggedInMember           = false;
+         $refType                  = false;
+         $refTypeName              = false;
+         $haveMember               = false;
+         $this->memberID           = false;
+         $memberData               = false;
+         $memberName               = false;
+         $membersList              = false;
+         $contactsList             = false;
+         $haveContacts             = false;
+         $contactID                = false;
+         $contactInfo              = false;
+         $newContactEmailExists    = false;
          $newContactUsernameExists = false;
-         $misMatchedWpUsers = false;
-         $newContactCreated = false;
-         $usingExistingWPContact = false;
-         $usernameChangedToWP = false;
-         $contactUpdated = false;
-         $filterArchived = false;
-         $filterText = false;
-         $haveFilter = false;
-         $userDeleted = false;
-         $wpUserDeleted = false;
-         $contactMembers = array();
- 
-         $numbContacts = false;
-         $numbDisplayed = false;
-         $lastDisplayed = false;
-         $paging = true;
-         $prevStart = false;
-         $nextStart = false;
-         $start = 1;
-         $limit = 20;        // Set to the number of listings per page
-         $namesList = false;
+         $misMatchedWpUsers        = false;
+         $newContactCreated        = false;
+         $usingExistingWPContact   = false;
+         $usernameChangedToWP      = false;
+         $contactUpdated           = false;
+         $filterArchived           = false;
+         $filterText               = false;
+         $haveFilter               = false;
+         $userDeleted              = false;
+         $wpUserDeleted            = false;
+         $contactMembers           = array();
+         $numbContacts             = false;
+         $numbDisplayed            = false;
+         $lastDisplayed            = false;
+         $paging                   = true;
+         $prevStart                = false;
+         $nextStart                = false;
+         $start                    = 1;
+         $limit                    = 20;        // Set to the number of listings per page
+         $namesList                = false;
 +        $customFieldResults = false;
  
          $where = '';