FundingRequestInitSubscriber: Don't try to resolve empty remote conta…

…ct ID
systopia · Nov 2, 2023 · 7b5d2b1 · 7b5d2b1
1 parent d5793b3
commit 7b5d2b1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Civi/Funding/EventSubscriber/Remote/FundingRequestInitSubscriber.php b/Civi/Funding/EventSubscriber/Remote/FundingRequestInitSubscriber.php
@@ -59,10 +59,10 @@ public function onRemoteRequestInit(InitApiRequestEvent $event): void {
     if (!$request instanceof GetFieldsAction || NULL !== $remoteContactId) {
       $this->requestContext->setRemote(TRUE);
     }
-    if (NULL !== $remoteContactId) {
+    $this->requestContext->setRemoteContactId($remoteContactId);
+    if (NULL !== $remoteContactId && '' !== $remoteContactId) {
       $contactId = $this->remoteContactIdResolver->getContactId($remoteContactId);
       $request->setExtraParam('contactId', $contactId);
-      $this->requestContext->setRemoteContactId($remoteContactId);
       $this->requestContext->setResolvedContactId($contactId);
     }
   }