From: Edward <edward@roojs.com>
Date: Thu, 20 Feb 2014 08:37:20 +0000 (+0800)
Subject: DataObjects/Core_mailing_list_message.php
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=73062e13255633c98d3bc012dc1fe0fa63c14f1c;p=Pman.Core

DataObjects/Core_mailing_list_message.php
---

diff --git a/DataObjects/Core_mailing_list_message.php b/DataObjects/Core_mailing_list_message.php
index 21346c0f..1e422f03 100644
--- a/DataObjects/Core_mailing_list_message.php
+++ b/DataObjects/Core_mailing_list_message.php
@@ -249,12 +249,7 @@ class Pman_Core_DataObjects_Core_mailing_list_message extends DB_DataObject
             mkdir(dirname($cachePath), 0700, true);
         }
         
-       
-        $message = $this->message();
-        
-        
-        
-        $message->processRelacements($replace_links);
+        $this->processRelacements($replace_links);
         
         $fh = fopen($cachePath, 'w');
 
@@ -324,4 +319,12 @@ Content-Transfer-Encoding: 7bit
         return false;
     }
     
+    function messageFrom()
+    {
+        
+        return '"' . addslashes($this->from_name) . '" <' . $this->from_email. '>'  ;
+        
+        
+    }
+    
 }