diff options
| author | rvelices <rv-github@modusoptimus.com> | 2010-05-28 19:58:51 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2010-05-28 19:58:51 +0000 |
| commit | 722c4a3a9740506ed4f409fcd9517027f8cbcee5 (patch) | |
| tree | f2df91637c418d6aacf07a4059fbe0a8923167cf /admin/notification_by_mail.php | |
| parent | ef50e468d4f7115e6e9ee7b54165230c8831109f (diff) | |
merge r6368,6410 from branch-2.1 to trunk
- merged the linkroot integration with the existing gallery_url (unique $conf['gallery_url'] used for RSS, mail homepage root in the browse path)
- added an option $conf['debug_mail'] - if set all outgoing mails are saved into local_data_dir
git-svn-id: http://piwigo.org/svn/trunk@6411 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | admin/notification_by_mail.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php index eb36beb00..602c67394 100644 --- a/admin/notification_by_mail.php +++ b/admin/notification_by_mail.php @@ -381,7 +381,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l array ( 'GOTO_GALLERY_TITLE' => $conf['gallery_title'], - 'GOTO_GALLERY_URL' => $conf['gallery_url'], + 'GOTO_GALLERY_URL' => get_gallery_home_url(), 'SEND_AS_NAME' => $env_nbm['send_as_name'], ) ); |