GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

allow passing an url to email confirmation function

This commit is contained in:
Evan Prodromou 2011-02-25 08:00:55 -08:00
parent f743a233ab
commit ecfb3b9288
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/mail.php
View File

@ -162,8 +162,12 @@ function mail_to_user(&$user, $subject, $body, $headers=array(), $address=null)
* *
* @return success flag * @return success flag
*/ */
function mail_confirm_address($user, $code, $nickname, $address) function mail_confirm_address($user, $code, $nickname, $address, $url=null)
{ {
if (empty($url)) {
$url = common_local_url('confirmaddress', array('code' => $code));
}
// TRANS: Subject for address confirmation email. // TRANS: Subject for address confirmation email.
$subject = _('Email address confirmation'); $subject = _('Email address confirmation');
@ -178,7 +182,8 @@ function mail_confirm_address($user, $code, $nickname, $address)
"Thanks for your time, \n%2\$s\n"), "Thanks for your time, \n%2\$s\n"),
$nickname, $nickname,
common_config('site', 'name'), common_config('site', 'name'),
common_local_url('confirmaddress', array('code' => $code))); $url);
$headers = array(); $headers = array();
return mail_to_user($user, $subject, $body, $headers, $address); return mail_to_user($user, $subject, $body, $headers, $address);