From 722c4a3a9740506ed4f409fcd9517027f8cbcee5 Mon Sep 17 00:00:00 2001 From: rvelices Date: Fri, 28 May 2010 19:58:51 +0000 Subject: 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 --- admin/notification_by_mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'admin/notification_by_mail.php') 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'], ) ); -- cgit v1.2.3