Merge branch '1.0.x' into testing

* 1.0.x:
  Update subject of one-time email reminders
This commit is contained in:
Zach Copley 2011-06-21 10:04:39 -07:00
commit a7b23fdb9d
2 changed files with 2 additions and 2 deletions

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,

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,