From f02f3e5931bce9638fb094ff63195f88f530d73e Mon Sep 17 00:00:00 2001 From: eileen Date: Sun, 26 Feb 2017 16:56:59 +1300 Subject: [PATCH] Enotice fix from recent merge --- CRM/Contact/BAO/Query.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index 5874379f8a..e905154411 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -5908,7 +5908,7 @@ AND displayRelType.is_active = 1 // This is a temporary routine for handling these fields while // we figure out how to handled them based on metadata in /// export and search builder. CRM-19815, CRM-19830. - if (isset($dao->$realField) && is_numeric($dao->$realField)) { + if (isset($dao->$realField) && is_numeric($dao->$realField) && isset($dao->$labelField)) { $dao->$realField = $dao->$labelField; } } -- 2.25.1