projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
009b21a
)
DataObjects/Core_email.php
author
edward
<edward@roojs.com>
Mon, 26 Mar 2018 06:06:10 +0000
(14:06 +0800)
committer
edward
<edward@roojs.com>
Mon, 26 Mar 2018 06:06:10 +0000
(14:06 +0800)
Mailer.php
DataObjects/Core_email.php
patch
|
blob
|
history
Mailer.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_email.php
b/DataObjects/Core_email.php
index
dd284f8
..
5bb7b2c
100644
(file)
--- a/
DataObjects/Core_email.php
+++ b/
DataObjects/Core_email.php
@@
-430,6
+430,10
@@
class Pman_Core_DataObjects_Core_email extends DB_DataObject
$cfg = array_merge($contents['mailer_opts'], $cfg);
}
$cfg = array_merge($contents['mailer_opts'], $cfg);
}
+ if(isset($contents['css_inline'])){
+ $cfg['css_inline'] = $contents['css_inline'];
+ }
+
$r = new Pman_Core_Mailer($cfg);
$imageCache = session_save_path() . '/email-cache-' . $ui['name'] . '/mail/' . $this->tableName() . '-' . $this->id . '-images.txt';
$r = new Pman_Core_Mailer($cfg);
$imageCache = session_save_path() . '/email-cache-' . $ui['name'] . '/mail/' . $this->tableName() . '-' . $this->id . '-images.txt';
diff --git
a/Mailer.php
b/Mailer.php
index
00950c3
..
30de1c6
100644
(file)
--- a/
Mailer.php
+++ b/
Mailer.php
@@
-460,7
+460,7
@@
class Pman_Core_Mailer {
@$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
$body = $dom->getElementsByTagName('body');
@$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
$body = $dom->getElementsByTagName('body');
-
+ print_R($body);exit;
$s = $dom->createElement('style');
$e = $dom->createTextNode($this->css_inline);
$s->appendChild($e);
$s = $dom->createElement('style');
$e = $dom->createTextNode($this->css_inline);
$s->appendChild($e);