Resolved issue 0000815: Email format standardization

Merge branch-1_7 2282:2283 into BSF


git-svn-id: http://piwigo.org/svn/trunk@2284 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 4 insertions, 6 deletions

diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index addb5a1f9..1143893d5 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -262,17 +262,15 @@ $conf['mail_options'] = false;
 // or test.
 $conf['send_bcc_mail_webmaster'] = false;
 
-// enabled_format_email:
-//  on true email will be formatted with name and address
-//  on false email will be only address
-// There are webhosting wich not allow email formatted (Lycos, ...)
-$conf['enabled_format_email'] = true;
-
 // default_email_format:
 //  Define the default email format use to send email
 //  Value could be text/plain  or text/html
 $conf['default_email_format'] = 'text/html';
 
+// define the name of sender mail:
+// If value is empty, gallery title is used
+$conf['mail_sender_name'] = '';
+
 // smtp configuration
 // (work if fsockopen function is allowed for smtp port)
 // smtp_host: smtp server host