wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pass nickname into mail_send_sms_notice_address()

Browse Source
This commit is contained in:
Evan Prodromou 2011-06-14 11:33:52 -04:00
parent 820e7586ec
commit e43a6241cb
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/mail.php
View File

@ -447,7 +447,8 @@ function mail_broadcast_notice_sms($notice)
__FILE__); __FILE__);
$success = mail_send_sms_notice_address($notice, $success = mail_send_sms_notice_address($notice,
$user->smsemail, $user->smsemail,
$user->incomingemail); $user->incomingemail,
$user->nickname);
if (!$success) { if (!$success) {
// XXX: Not sure, but I think that's the right thing to do // XXX: Not sure, but I think that's the right thing to do
common_log(LOG_WARNING, common_log(LOG_WARNING,
@ -480,7 +481,8 @@ function mail_send_sms_notice($notice, $user)
{ {
return mail_send_sms_notice_address($notice, return mail_send_sms_notice_address($notice,
$user->smsemail, $user->smsemail,
$user->incomingemail); $user->incomingemail,
$user->nickname);
} }
/** /**
@ -492,10 +494,11 @@ function mail_send_sms_notice($notice, $user)
* @param Notice $notice notice to send * @param Notice $notice notice to send
* @param string $smsemail email address to send to * @param string $smsemail email address to send to
* @param string $incomingemail email address to set as 'from' * @param string $incomingemail email address to set as 'from'
* @param string $nickname nickname to add to beginning
* *
* @return boolean success flag * @return boolean success flag
*/ */
function mail_send_sms_notice_address($notice, $smsemail, $incomingemail) function mail_send_sms_notice_address($notice, $smsemail, $incomingemail, $nickname)
{ {
$to = $nickname . ' <' . $smsemail . '>'; $to = $nickname . ' <' . $smsemail . '>';