Changeset 13106 for trunk/admin

Timestamp:

Feb 11, 2012, 11:39:56 PM (12 years ago)

Author:

plg

Message:

merge r13105 from branch 2.3 to trunk

bug 2551 fixed: force the use of $confgallery_url (thanks to the
get_gallery_home_url function) to build subscribe/unsubscribe links
in NBM emails.

File:

• trunk/admin/include/functions_notification_by_mail.inc.php (modified) (1 diff)

trunk/admin/include/functions_notification_by_mail.inc.php

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