mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-29 20:59:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge r7004 from branch 2.1 to trunk

Browse source 
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
This commit is contained in:
plegall 2010-09-22 21:20:31 +00:00
parent 5ff171684e
commit 70978fdf54
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -360,6 +360,8 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su
{ {
global $conf, $page, $env_nbm, $conf; global $conf, $page, $env_nbm, $conf;
set_make_full_url();
$check_key_treated = array(); $check_key_treated = array();
$updated_data_count = 0; $updated_data_count = 0;
$error_on_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)); $error_on_updated_data_count));
} }
unset_make_full_url();
return $check_key_treated; return $check_key_treated;
} }