Index: branches/5.3.x/core/install/english.lang
===================================================================
--- branches/5.3.x/core/install/english.lang
+++ branches/5.3.x/core/install/english.lang
@@ -1882,16 +1882,16 @@
WW91ciBtZW1iZXJzaGlwIG9uIDxpbnAyOm1fTGluayB0ZW1wbGF0ZT0iaW5kZXgiLz4gd2Vic2l0ZSB3aWxsIHNvb24gZXhwaXJlLg==
- TWVtYmVyc2hpcCBFeHBpcmF0aW9uIE5vdGljZSBmb3IgIjxpbnAyOnVfRmllbGQgbmFtZT0iVXNlcm5hbWUiLz4iIFNlbnQ=
- VXNlciA8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+IG1lbWJlcnNoaXAgd2lsbCBleHBpcmUgc29vbi4=
+ TWVtYmVyc2hpcCBFeHBpcmF0aW9uIE5vdGljZSBmb3IgIjxpbnAyOkZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+IiBTZW50
+ VXNlciA8aW5wMjpGaWVsZCBuYW1lPSJVc2VybmFtZSIvPiBtZW1iZXJzaGlwIHdpbGwgZXhwaXJlIHNvb24u
WW91ciBNZW1iZXJzaGlwIEV4cGlyZWQ=
WW91ciBtZW1iZXJzaGlwIG9uIDxpbnAyOm1fTGluayB0ZW1wbGF0ZT0iaW5kZXgiLz4gd2Vic2l0ZSBoYXMgZXhwaXJlZC4=
- VXNlcidzIE1lbWJlcnNoaXAgRXhwaXJlZCAgKCA8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+KQ==
- VXNlcidzICg8aW5wMjp1X0ZpZWxkIG5hbWU9IlVzZXJuYW1lIi8+KSBtZW1iZXJzaGlwIG9uIDxpbnAyOm1fTGluayB0ZW1wbGF0ZT0iaW5kZXgiLz4gd2Vic2l0ZSBoYXMgZXhwaXJlZC4=
+ VXNlcidzIE1lbWJlcnNoaXAgRXhwaXJlZCAgKCA8aW5wMjpGaWVsZCBuYW1lPSJVc2VybmFtZSIvPik=
+ VXNlcidzICg8aW5wMjpGaWVsZCBuYW1lPSJVc2VybmFtZSIvPikgbWVtYmVyc2hpcCBvbiA8aW5wMjptX0xpbmsgdGVtcGxhdGU9ImluZGV4Ii8+IHdlYnNpdGUgaGFzIGV4cGlyZWQu
TmV3IHBhc3N3b3JkIGdlbmVyYXRlZA==
Index: branches/5.3.x/core/install/upgrades.sql
===================================================================
--- branches/5.3.x/core/install/upgrades.sql
+++ branches/5.3.x/core/install/upgrades.sql
@@ -3026,3 +3026,10 @@
UPDATE Modules
SET ClassNamespace = 'InPortal\\Core'
WHERE `Name` IN ('Core', 'In-Portal');
+
+UPDATE EmailTemplates
+SET
+ l1_Subject = REPLACE(l1_Subject, '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