projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7233385
)
Mailer.php
author
Alan Knowles
<alan@roojs.com>
Wed, 24 Jul 2013 05:43:02 +0000
(13:43 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 24 Jul 2013 05:43:02 +0000
(13:43 +0800)
Mailer.php
patch
|
blob
|
history
diff --git
a/Mailer.php
b/Mailer.php
index
50beb91
..
4c1ad1c
100644
(file)
--- a/
Mailer.php
+++ b/
Mailer.php
@@
-107,6
+107,11
@@
class Pman_Core_Mailer {
$tmp_opts['locale'] = $fopts['locale'];
}
+ // local opt's overwrite
+ if (!empty($this->locale)) {
+ $tmp_opts['locale'] = $this->locale;
+ }
+
$htmlbody = false;
$htmltemplate = new HTML_Template_Flexy( $tmp_opts );
@@
-124,6
+129,9
@@
class Pman_Core_Mailer {
}
$tmp_opts['nonHTML'] = true;
+
+
+
// $tmp_opts['force'] = true;
$template = new HTML_Template_Flexy( $tmp_opts );