From 908f91d04b1d23f25a35c386000fcbff3faac4f1 Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Mon, 6 Jan 2014 18:35:59 -0800
Subject: [PATCH] CRM-13995 - Add is_object check to prevent notices.

----------------------------------------
* CRM-13995: contact export when merging households: some household fields missing
  http://issues.civicrm.org/jira/browse/CRM-13995
---
 CRM/Export/BAO/Export.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
index 1ed6118dea..029aa5ee75 100644
--- a/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@ -871,7 +871,7 @@ INSERT INTO {$componentTable} SELECT distinct gc.contact_id FROM civicrm_group_c
                 }
               }
               // CRM-13995
-              elseif (in_array($relationField, array(
+              elseif (is_object($relDAO) && in_array($relationField, array(
                 'email_greeting', 'postal_greeting', 'addressee'))) {
                 //special case for greeting replacement
                 $fldValue = "{$relationField}_display";
-- 
2.25.1