X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_email.php;h=cbaba21282ba5ad3befe6f9d95bf3f36f35545f0;hp=00b564383ff707bad82175305466b8c95ef52d8f;hb=HEAD;hpb=dff7116c31985c523f927df3e8e7cf50670ef428

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 00b56438..02ce3427 100644
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -23,9 +23,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
     public $active;
     public $bcc_group_id;
     public $test_class;
-    
- 
-
+     
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
     
@@ -61,6 +59,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
                     bcc_group_id = {$cgm}.group_id
             )  AS bcc_group_member_count
         ");
+
 	
 	if (!empty($_REQUEST['_hide_system_emails'])) {
 	    $this->whereAddIn("!{$this->tableName()}.name", array('EVENT_ERRORS_REPORT'), 'string');
@@ -75,7 +74,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         $i->ontable = $this->tableName();
         $i->find();
         while ($i->fetch()){
-            $i->beforeDelete();
+            $i->beforeDelete(array(), $roo);
             $i->delete();
         }
     }
@@ -295,7 +294,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
                 $html->item(0)->appendChild($element);
             }
             
-            $this->plaintext = str_replace("{unsubscribe_link}", $unsubscribe, $this->plaintext);
+            $this->plaintext = str_replace("{unsubscribe_link}", $unsubscribe, empty($this->plaintext) ? '' : $this->plaintext);
         }
         
         
@@ -385,9 +384,9 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
 	    $members = $this->to_group()->members();
 	    $contents['rcpts'] = array();
 	    foreach($this->to_group()->members() as $m) {
-		$contents['rcpts'][] = $m->getEmailFrom();
+		$contents['rcpts'][] = $m->email;
 	    }
-	    
+	    //var_dump($contents['rcpts']);
 	    
 	}
         //subject replacement