From: monishdeb Date: Mon, 31 Aug 2015 07:46:04 +0000 (+0530) Subject: CRM-17073 fix - Merge Household Members Into Their Household on Export X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9db71ff24ebb6235c3ec58c4b02e6b5a50921e4e;p=civicrm-core.git CRM-17073 fix - Merge Household Members Into Their Household on Export https://issues.civicrm.org/jira/browse/CRM-17073 --- diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index bd8f765f88..624ce0e2f4 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -5532,7 +5532,7 @@ AND displayRelType.is_active = 1 continue; } - if (property_exists($dao, $value['idCol'])) { + if (is_object($dao) && property_exists($dao, $value['idCol'])) { $val = $dao->$value['idCol']; if (CRM_Utils_System::isNull($val)) {