Index: core/units/users/users_event_handler.php =================================================================== --- core/units/users/users_event_handler.php +++ core/units/users/users_event_handler.php @@ -1035,12 +1035,19 @@ $records = $this->Conn->Query($sql); if ($records) { $conditions = Array(); - $send_params = Array ('PrefixSpecial' => 'u'); + + /** @var UsersItem $user */ + $user = $this->Application->recallObject('u', null, array('skip_autoload' => true)); foreach ($records as $record) { - $send_params['item_id'] = $record['PortalUserId']; - $this->Application->emailUser('USER.MEMBERSHIP.EXPIRATION.NOTICE', $record['PortalUserId'], $send_params); - $this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRATION.NOTICE', null, $send_params); + $user->Load($record['PortalUserId']); + + $this->Application->emailUser( + 'USER.MEMBERSHIP.EXPIRATION.NOTICE', + $record['PortalUserId'], + $user->getEmailParams() + ); + $this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRATION.NOTICE', null, $user->getEmailParams()); $conditions[] = '(PortalUserId = '.$record['PortalUserId'].' AND GroupId = '.$record['GroupId'].')'; } @@ -1057,12 +1064,14 @@ WHERE (MembershipExpires IS NOT NULL) AND (MembershipExpires < '.time().')'; $user_ids = $this->Conn->GetCol($sql); if ($user_ids) { - $send_params = Array ('PrefixSpecial' => 'u'); + /** @var UsersItem $user */ + $user = $this->Application->recallObject('u', null, array('skip_autoload' => true)); foreach ($user_ids as $id) { - $send_params['item_id'] = $id; - $this->Application->emailUser('USER.MEMBERSHIP.EXPIRED', $id, $send_params); - $this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRED', null, $send_params); + $user->Load($id); + + $this->Application->emailUser('USER.MEMBERSHIP.EXPIRED', $id, $user->getEmailParams()); + $this->Application->emailAdmin('USER.MEMBERSHIP.EXPIRED', null, $user->getEmailParams()); } } $sql = 'DELETE FROM '.TABLE_PREFIX.'UserGroupRelations