projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dd1f870
)
DataObjects/Core_email.php
author
Alan Knowles
<alan@roojs.com>
Fri, 3 Jun 2016 07:42:17 +0000
(15:42 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 3 Jun 2016 07:42:17 +0000
(15:42 +0800)
DataObjects/Core_email.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_email.php
b/DataObjects/Core_email.php
index
d036868
..
23a1770
100644
(file)
--- 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;