From: Donald A. Lobo <lobo@civicrm.org>
Date: Wed, 29 Jan 2014 00:09:49 +0000 (-0800)
Subject: CRM-14130 - Undefined property: CRM_Core_DAO...reply.php
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8c8b0e30741ad7a701ac2f5ca602d97f8ee9f78c;p=civicrm-core.git

CRM-14130 - Undefined property: CRM_Core_DAO...reply.php

http://issues.civicrm.org/jira/browse/CRM-14130
---

diff --git a/CRM/Mailing/Event/BAO/Reply.php b/CRM/Mailing/Event/BAO/Reply.php
index ed7dd634df..3e71c6c484 100644
--- a/CRM/Mailing/Event/BAO/Reply.php
+++ b/CRM/Mailing/Event/BAO/Reply.php
@@ -116,7 +116,9 @@ class CRM_Mailing_Event_BAO_Reply extends CRM_Mailing_Event_DAO_Reply {
 
     $eq = new CRM_Core_DAO();
     $eq->query("SELECT     $contacts.display_name as display_name,
-                               $emails.email as email
+                           $emails.email as email,
+                           $queue.job_id as job_id,
+                           $queue.hash as hash
                    FROM        $queue
                    INNER JOIN  $contacts
                            ON  $queue.contact_id = $contacts.id
@@ -144,7 +146,9 @@ class CRM_Mailing_Event_BAO_Reply extends CRM_Mailing_Event_DAO_Reply {
       $b = $parsed->generateBody();
 
       // strip Return-Path of possible bounding brackets, CRM-4502
-      $h['Return-Path'] = trim($h['Return-Path'], '<>');
+      if (!empty($h['Return-Path'])) {
+        $h['Return-Path'] = trim($h['Return-Path'], '<>');
+      }
 
       // FIXME: ugly hack - find the first MIME boundary in
       // the body and make the boundary in the header match it