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

Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

This commit is contained in:
Evan Prodromou 2011-06-21 14:12:24 -04:00
parent 718203306c 14f555fe65
commit f7ba2d1f8a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/EmailReminder/lib/userconfirmregreminderhandler.php
View File

@ -83,7 +83,7 @@ class UserConfirmRegReminderHandler extends UserReminderHandler {
// we've already pestered her at all before
if (Email_reminder::needsReminder(self::REGISTER_REMINDER, $confirm)) {
common_log(LOG_INFO, "Sending one-time registration confirmation reminder to {$confirm->address}", __FILE__);
$subject = _m("One time reminder - please confirm your registration!");
$subject = _m("Reminder - please confirm your registration!");
return EmailReminderPlugin::sendReminder(
self::REGISTER_REMINDER,
$confirm,

2
plugins/EmailReminder/lib/userinvitereminderhandler.php
View File

@ -84,7 +84,7 @@ class UserInviteReminderHandler extends UserReminderHandler {
// we've already pestered her at all before
if (Email_reminder::needsReminder(self::INVITE_REMINDER, $invitation)) {
common_log(LOG_INFO, "Sending one-time invitation reminder to {$invitation->address}", __FILE__);
$subject = _m("One time reminder - you have been invited to join {$siteName}!");
$subject = _m("Reminder - you have been invited to join {$siteName}!");
return EmailReminderPlugin::sendReminder(
self::INVITE_REMINDER,
$invitation,

3
plugins/EmailReminder/scripts/sendemailreminder.php
View File

@ -99,9 +99,10 @@ if (have_option('u', 'universe')) {
foreach ($reminders as $reminder) {
extract($reminder);
$qm->enqueue(array($type, $opts), 'siterem');
if (!$quiet) { print "Sent pending {$type} reminders to all unconfirmed addresses in the known universe.\n"; }
if (!$quiet) { print "Sent pending {$type} reminders for {$server}.\n"; }
}
}
if (!$quiet) { print "Done! Reminders sent to all unconfirmed addresses in the known universe.\n"; }
}
} else {
$qm = QueueManager::get();