diff options
| author | rub <rub@piwigo.org> | 2008-03-18 22:02:33 +0000 |
|---|---|---|
| committer | rub <rub@piwigo.org> | 2008-03-18 22:02:33 +0000 |
| commit | 6ae74fe965c16e1e1dae654eb3e3d43e32224bce (patch) | |
| tree | a064d0fcda4fd6091fd76dcbeed42ae889e1b40e /admin/include | |
| parent | 0da8401a9ccaa0c92821a0b38e5a9e27ca19af44 (diff) | |
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
Diffstat (limited to '')
| -rw-r--r-- | admin/include/functions_notification_by_mail.inc.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php index 13a7e2aad..7328df82e 100644 --- a/admin/include/functions_notification_by_mail.inc.php +++ b/admin/include/functions_notification_by_mail.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | PhpWebGallery - a PHP based picture gallery | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | -// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | +// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ // | file : $Id$ // | last update : $Date$ @@ -200,7 +200,7 @@ function begin_users_env_nbm($is_to_send_mail = false) { // Init mail configuration $env_nbm['email_format'] = get_str_email_format($conf['nbm_send_html_mail']); - $env_nbm['send_as_name'] = ((isset($conf['nbm_send_mail_as']) and !empty($conf['nbm_send_mail_as'])) ? $conf['nbm_send_mail_as'] : $conf['gallery_title']); + $env_nbm['send_as_name'] = ((isset($conf['nbm_send_mail_as']) and !empty($conf['nbm_send_mail_as'])) ? $conf['nbm_send_mail_as'] : get_mail_sender_name()); $env_nbm['send_as_mail_address'] = get_webmaster_mail_address(); $env_nbm['send_as_mail_formated'] = format_email($env_nbm['send_as_name'], $env_nbm['send_as_mail_address']); // Init mail counter |