merge r3381 from branch 2.0 to trunk

feature 1020 added: ability to subscribe to Piwigo Announcement Newsletter from
Piwigo itself. Admins can perform this action at the end of installation or on
administration panel index.

git-svn-id: http://piwigo.org/svn/trunk@3382 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2009-05-31 19:46:59 +00:00
parent 01dc8c2677
commit 654ce203d3
8 changed files with 63 additions and 3 deletions
+9
View File
@@ -2114,4 +2114,13 @@ SELECT '.$conf['user_fields']['username'].'
return $username;
}
function get_newsletter_subscribe_base_url($language) {
$subscribe_domain = 'piwigo.org';
if ('fr_FR' == $language) {
$subscribe_domain = 'fr.piwigo.org';
}
return 'http://'.$subscribe_domain.'/announcement/subscribe.php?email=';
}
?>