From: Alan Knowles Date: Fri, 3 Jun 2016 07:42:17 +0000 (+0800) Subject: DataObjects/Core_email.php X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=f4acab1acf36dd277b4776b237b124abdc978401 DataObjects/Core_email.php --- diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php index d0368682..23a1770b 100644 --- a/DataObjects/Core_email.php +++ b/DataObjects/Core_email.php @@ -301,7 +301,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject function toMailer($obj,$force=false) { - + $p = new PEAR(); $contents = (array)$obj; @@ -310,7 +310,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject } if(empty($this->id)){ - $p = new PEAR(); + return $p->raiseError("template [{$contents['template']}] has not been set"); } @@ -332,9 +332,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject $contents['rcpts'] = $admin; } - - - + if(empty($contents['subject'])){ $contents['subject'] = $this->subject;