[svn r17920] Improve charset detection in mail config. Ensure there is a default value if global param is not detected (see FS#2445)

16 years ago · 51505f9be0
parent 3f37281154
commit 51505f9be0
1 changed files with 6 additions and 4 deletions
--- a/main/inc/conf/mail.conf.dist.php
+++ b/main/inc/conf/mail.conf.dist.php
@ -10,9 +10,11 @@ $platform_email['SMTP_PORT']         = 25;
 $platform_email['SMTP_MAILER']       = 'mail'; //mail, sendmail or smtp 
 $platform_email['SMTP_AUTH']         = 0; 
 $platform_email['SMTP_USER']         = ''; 
-$platform_email['SMTP_PASS']         = ''; 
-$platform_email['SMTP_CHARSET']      = $charset; 
-
+$platform_email['SMTP_PASS']         = '';
+$platform_email['SMTP_CHARSET']      = 'ISO-8859-15'; 
+global $charset;
+if (!empty($charset) && $charset != $platform_email['SMTP_CHARSET']) { 
+    $platform_email['SMTP_CHARSET']      = $charset; 
+}
 // ====================================================================
-
 ?>