From ab601e5c4d88778d77fcc8fa98e774548468ba0d Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 30 Apr 2018 14:43:18 -0400
Subject: [PATCH] Update for dev70 version

Have to mask a few members imports
Have conflicting user name or emails.
---
 models/admin/migcsa/index.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/models/admin/migcsa/index.php b/models/admin/migcsa/index.php
index 39faadb..bdd0096 100644
--- a/models/admin/migcsa/index.php
+++ b/models/admin/migcsa/index.php
@@ -358,6 +358,7 @@ class GlmMembersAdmin_migcsa_index
         SELECT M.*,S.state_abb
           FROM member M LEFT OUTER JOIN state S ON (S.state_id = M.mailing_state_id)
          WHERE M.member_id NOT IN (" . implode( ',', $old_members ) . ")
+	   AND M.member_id NOT IN (7608,7613,7628,7629,7638,7639,7640,7647)
         ORDER BY M.member_id";
         $stmt = $this->dbh->query( $sql );
         $members = $stmt->fetchAll();
@@ -460,8 +461,9 @@ class GlmMembersAdmin_migcsa_index
                         update_user_meta($wpUserID, 'glmMembersContactActive', true);
                         echo '<pre>$wpUserID: ' . print_r( $wpUserID, true ) . '</pre>';
                     } else if ( is_wp_error( $wpUserID ) ) {
+	 	    	$messages[] = '<pre>' . print_r( $contact, true) . '</pre>';
                         $error = true;
-                        $messages[''] = $errors['username'] = '<span style="color:red;">An error occurred! ' . $wpUserID->get_error_message() . '</span>';
+                        $messages[] = '<span style="color:red;">An error occurred! ' . $wpUserID->get_error_message() . '</span>';
                     } else {
                         $error = true;
                         $messages[] = '<span style="color:red;">An error occurred! wpUserID</span>';
@@ -648,7 +650,7 @@ class GlmMembersAdmin_migcsa_index
         // END Transaction
         if ( !$error ) {
             $this->wpdb->query( 'COMMIT' );
-            // $this->wpdb->query( 'ROLLBACK' );
+            //$this->wpdb->query( 'ROLLBACK' );
         } else {
             $this->wpdb->query( 'ROLLBACK' );
         }
-- 
2.17.1