projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
39a4ead
)
DataObjects/Core_email.php
author
john
<john@roojs.com>
Thu, 11 Jan 2018 08:39:51 +0000
(16:39 +0800)
committer
john
<john@roojs.com>
Thu, 11 Jan 2018 08:39:51 +0000
(16:39 +0800)
DataObjects/Core_email.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_email.php
b/DataObjects/Core_email.php
index
ee2ae83
..
de91473
100644
(file)
--- a/
DataObjects/Core_email.php
+++ b/
DataObjects/Core_email.php
@@
-306,8
+306,6
@@
class Pman_Core_DataObjects_Core_email extends DB_DataObject
$p = new PEAR();
$contents = (array)$obj;
$p = new PEAR();
$contents = (array)$obj;
- var_dump($content);
-
if(empty($this->id) && !empty($contents['template'])){
$this->get('name', $contents['template']);
}
if(empty($this->id) && !empty($contents['template'])){
$this->get('name', $contents['template']);
}
@@
-348,9
+346,9
@@
class Pman_Core_DataObjects_Core_email extends DB_DataObject
$contents['subject'] = $this->subject;
}
$contents['subject'] = $this->subject;
}
- if (!empty($content['subject_replace'])) {
- foreach ($content['mapping'] as $pattern => $replace) {
- $content
['subject'] = preg_replace($pattern,$replace,$content
['subject']);
+ if (!empty($content
s
['subject_replace'])) {
+ foreach ($content
s
['mapping'] as $pattern => $replace) {
+ $content
s['subject'] = preg_replace($pattern,$replace,$contents
['subject']);
}
}
}
}