aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-02-11 22:39:56 +0000
committerplegall <plg@piwigo.org>2012-02-11 22:39:56 +0000
commit1ea81f6e9343338ec9920c0dc6ea9257bedaaecf (patch)
tree3453efdb8c0d5b27b36118f13c2124cc9d476cb6 /admin/include
parent43224c2c6521b65356a7d360fbac83e5c4046912 (diff)
merge r13105 from branch 2.3 to trunk
bug 2551 fixed: force the use of $conf['gallery_url'] (thanks to the get_gallery_home_url function) to build subscribe/unsubscribe links in NBM emails. git-svn-id: http://piwigo.org/svn/trunk@13106 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/functions_notification_by_mail.inc.php4
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 7d3c0071c..92b44aab7 100644
--- a/admin/include/functions_notification_by_mail.inc.php
+++ b/admin/include/functions_notification_by_mail.inc.php
@@ -339,8 +339,8 @@ function assign_vars_nbm_mail_content($nbm_user)
'SEND_AS_NAME' => $env_nbm['send_as_name'],
- 'UNSUBSCRIBE_LINK' => add_url_params(get_root_url().'nbm.php', array('unsubscribe' => $nbm_user['check_key'])),
- 'SUBSCRIBE_LINK' => add_url_params(get_root_url().'nbm.php', array('subscribe' => $nbm_user['check_key'])),
+ 'UNSUBSCRIBE_LINK' => add_url_params(get_gallery_home_url().'/nbm.php', array('unsubscribe' => $nbm_user['check_key'])),
+ 'SUBSCRIBE_LINK' => add_url_params(get_gallery_home_url().'/nbm.php', array('subscribe' => $nbm_user['check_key'])),
'CONTACT_EMAIL' => $env_nbm['send_as_mail_address']
)
);