Fixed #148 properly

putyourlightson · Jun 18, 2020 · 1ad56b6 · 1ad56b6
1 parent 8879228
commit 1ad56b6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/services/PendingContactsService.php b/src/services/PendingContactsService.php
@@ -107,6 +107,10 @@ public function verifyPendingContact(string $pid)
     {
         $pendingContact = $this->getPendingContactByPid($pid);
 
+        if ($pendingContact === null) {
+            return null;
+        }
+
         // Get contact if it exists
         $contact = Campaign::$plugin->contacts->getContactByEmail($pendingContact->email);
 
@@ -116,7 +120,7 @@ public function verifyPendingContact(string $pid)
 
             // If no contact found or trashed contact could not be restored
             if ($contact === null || !Craft::$app->getElements()->restoreElement($contact)) {
-                return null;
+                $contact = new ContactElement();
             }
         }