aboutsummaryrefslogtreecommitdiffstats
path: root/themes
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2013-10-17 13:05:30 +0000
committerplegall <plg@piwigo.org>2013-10-17 13:05:30 +0000
commitd1a0a85520e23bf71f39fcf38eca4480a73b4975 (patch)
tree952a3f8d356d5e24d51380a3b62a41e086a763cc /themes
parente62abd7d4eaab3aafbe88189d3fbf71c4c29a7fd (diff)
feature 2965: replace custom mail functions by PHPMailer (version 5.2.7).
Based on patch by msakik. function pwg_send_mail no longer used (all is done in pwg_mail) new param $conf['smtp_secure'] work still in progress, some obsolete code must be removed git-svn-id: http://piwigo.org/svn/trunk@24951 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'themes')
-rw-r--r--themes/default/template/mail/text/html/header.tpl4
-rw-r--r--themes/default/template/mail/text/plain/header.tpl4
2 files changed, 1 insertions, 7 deletions
diff --git a/themes/default/template/mail/text/html/header.tpl b/themes/default/template/mail/text/html/header.tpl
index e6af4c024..9520bdb20 100644
--- a/themes/default/template/mail/text/html/header.tpl
+++ b/themes/default/template/mail/text/html/header.tpl
@@ -1,7 +1,3 @@
------={$BOUNDARY_KEY}
-Content-Type: {$CONTENT_TYPE}; charset="{$CONTENT_ENCODING}";
-Content-Transfer-Encoding: 8bit
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="{$lang_info.code}" dir="{$lang_info.direction}">
<head>
diff --git a/themes/default/template/mail/text/plain/header.tpl b/themes/default/template/mail/text/plain/header.tpl
index 6fcc863d2..88cd997fa 100644
--- a/themes/default/template/mail/text/plain/header.tpl
+++ b/themes/default/template/mail/text/plain/header.tpl
@@ -1,5 +1,3 @@
------={$BOUNDARY_KEY}
-Content-Type: {$CONTENT_TYPE}; charset="{$CONTENT_ENCODING}";
-Content-Transfer-Encoding: 8bit{literal}
+{literal}
{/literal}{*note that there must be an empty line to separate the mime headers*}