projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6ace050
)
DataObjects/Core_email.php
author
john
<john@roojs.com>
Wed, 10 Jan 2018 08:18:48 +0000
(16:18 +0800)
committer
john
<john@roojs.com>
Wed, 10 Jan 2018 08:18:48 +0000
(16:18 +0800)
DataObjects/Core_email.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_email.php
b/DataObjects/Core_email.php
index
341bdd3
..
f86f284
100644
(file)
--- a/
DataObjects/Core_email.php
+++ b/
DataObjects/Core_email.php
@@
-305,18
+305,7
@@
class Pman_Core_DataObjects_Core_email extends DB_DataObject
$p = new PEAR();
$contents = (array)$obj;
$p = new PEAR();
$contents = (array)$obj;
-
- if (!empty($obj['subject_replace'])) {
- $mapping = array(
- '/{person.name}/' => $obj['person']->name
- );
- $subject = $obj['subject'];
- foreach ($mapping as $pattern => $replace) {
- $subject = preg_replace($pattern,$replace,$subject);
- }
- $content['subject'] = $subject;
- }
-
+
if(empty($this->id) && !empty($contents['template'])){
$this->get('name', $contents['template']);
}
if(empty($this->id) && !empty($contents['template'])){
$this->get('name', $contents['template']);
}