From eb2a4878b92222dc57a6c526732da278f43bee55 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 12 Oct 2021 13:17:57 +1300
Subject: [PATCH] Do not find references for empty values.

---
 CRM/Core/Reference/Basic.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/CRM/Core/Reference/Basic.php b/CRM/Core/Reference/Basic.php
index ae8684837b..5bd6792bc8 100644
--- a/CRM/Core/Reference/Basic.php
+++ b/CRM/Core/Reference/Basic.php
@@ -112,21 +112,26 @@ EOS;
    */
   public function getReferenceCount($targetDao) {
     $targetColumn = $this->getTargetKey();
-    $params = [
-      1 => [$targetDao->$targetColumn, 'String'],
-    ];
-    $sql = <<<EOS
+    $count = 0;
+    if ($targetDao->{$targetColumn} !== '' && $targetDao->{$targetColumn} !== NULL) {
+
+      $params = [
+        1 => [$targetDao->{$targetColumn} ?? '', 'String'],
+      ];
+      $sql = <<<EOS
 SELECT count(*)
 FROM {$this->getReferenceTable()}
 WHERE {$this->getReferenceKey()} = %1
 EOS;
+      $count = CRM_Core_DAO::singleValueQuery($sql, $params);
+    }
 
     return [
       'name' => implode(':', ['sql', $this->getReferenceTable(), $this->getReferenceKey()]),
       'type' => get_class($this),
       'table' => $this->getReferenceTable(),
       'key' => $this->getReferenceKey(),
-      'count' => CRM_Core_DAO::singleValueQuery($sql, $params),
+      'count' => $count,
     ];
   }
 
-- 
2.25.1