Merge pull request #589 from greezybacon/issue/569

oops: Don't crash on setting Return-Path

Reviewed-By: Peter Rotich <peter@osticket.com>

include/class.mailer.php

@@ -104,15 +104,16 @@ class Mailer {
                 ($this->getEmail()?$this->getEmail()->getEmail():'@osTicketMailer'));
 
         $headers = array (
-                'From' => $this->getFromAddress(),
-                'To' => $to,
-                'Subject' => $subject,
-                'Date'=> date('D, d M Y H:i:s O'),
-                'Message-ID' => $messageId,
-                'X-Mailer' =>'osTicket Mailer',
-                'Return-Path' => $this->getEmail()->getEmail(),
-               );
-
+            'From' => $this->getFromAddress(),
+            'To' => $to,
+            'Subject' => $subject,
+            'Date'=> date('D, d M Y H:i:s O'),
+            'Message-ID' => $messageId,
+            'X-Mailer' =>'osTicket Mailer',
+        );
+
+        if ($this->getEmail() instanceof Email)
+            $headers['Return-Path'] = $this->getEmail()->getEmail();
 
         //Bulk.
         if (isset($options['bulk']) && $options['bulk'])