archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r13105 from branch 2.3 to trunk

Browse source 
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
This commit is contained in:
plegall 2012-02-11 22:39:56 +00:00
parent 43224c2c65
commit 1ea81f6e93
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
admin/include/functions_notification_by_mail.inc.php
View file

@ -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']
)
);