aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/config_default.inc.php3
-rw-r--r--include/functions_mail.inc.php4
2 files changed, 2 insertions, 5 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 2ecfd226b..b0a42d4ae 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -287,9 +287,6 @@ $conf['mail_sender_email'] = '';
// set true to allow text/html emails
$conf['mail_allow_html'] = true;
-// 'clear' or 'dark'
-$conf['mail_theme'] = 'clear';
-
// smtp configuration (work if fsockopen function is allowed for smtp port)
// smtp_host: smtp server host
// if null, regular mail function is used
diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php
index 443a9b4e1..d6f7ea632 100644
--- a/include/functions_mail.inc.php
+++ b/include/functions_mail.inc.php
@@ -680,8 +680,8 @@ function pwg_mail($to, $args=array(), $tpl=array())
{
if ($template->smarty->template_exists('global-mail-css.tpl'))
{
- $template->set_filename('css', 'global-mail-css.tpl');
- $template->assign_var_from_handle('GLOBAL_MAIL_CSS', 'css');
+ $template->set_filename('global-css', 'global-mail-css.tpl');
+ $template->assign_var_from_handle('GLOBAL_MAIL_CSS', 'global-css');
}
if ($template->smarty->template_exists('mail-css-'. $args['theme'] .'.tpl'))