From: eileen <emcnaughton@wikimedia.org>
Date: Sun, 26 Feb 2017 03:56:59 +0000 (+1300)
Subject: Enotice fix from recent merge
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f02f3e5931bce9638fb094ff63195f88f530d73e;p=civicrm-core.git

Enotice fix from recent merge
---

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;
         }
       }