aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-09-22 21:20:31 +0000
committerplegall <plg@piwigo.org>2010-09-22 21:20:31 +0000
commit70978fdf5471e3a9b08bc948b4d0a3640d35f42c (patch)
tree5945f94c4e8522d1dc8e1ace08c05b9a57f74d1d /admin/include
parent5ff171684eec339ed83119eb57e124174c07d465 (diff)
merge r7004 from branch 2.1 to trunk
bug 1872 fixed: we need to call set_make_full_url() before creating urls provided in emails git-svn-id: http://piwigo.org/svn/trunk@7005 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include')
-rw-r--r--admin/include/functions_notification_by_mail.inc.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php
index 31175b55c..51e3bcf73 100644
--- a/admin/include/functions_notification_by_mail.inc.php
+++ b/admin/include/functions_notification_by_mail.inc.php
@@ -360,6 +360,8 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su
{
global $conf, $page, $env_nbm, $conf;
+ set_make_full_url();
+
$check_key_treated = array();
$updated_data_count = 0;
$error_on_updated_data_count = 0;
@@ -496,6 +498,8 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su
$error_on_updated_data_count));
}
+ unset_make_full_url();
+
return $check_key_treated;
}