Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.1] Upmerges 2024-08-26 #43987

Merged
merged 7 commits into from
Aug 26, 2024
Merged

[5.1] Upmerges 2024-08-26 #43987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3550335
Joomla! 4.4.8 Rc 2
MacJoom Aug 24, 2024
d45157b
Revert to dev
MacJoom Aug 24, 2024
b08efee
fix the parameter formats of both, pagination and cache (#43983)
SniperSister Aug 25, 2024
9c9dd25
[4.x] Translation Update (#43980)
joomla-translation-bot Aug 25, 2024
ddf3f3b
new dates (#43984)
tecpromotion Aug 26, 2024
2d7667e
[4.4] Escape unsafe tags in mail copy to sender and notification to a…
richard67 Aug 26, 2024
d815c63
Merge remote-tracking branch 'origin/4.4-dev' into 5.1/upmerges/2024-…
LadySolveig Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/create-translation-pull-request-v4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Create translation pull request
name: Create translation pull request J4

on:
push:
Expand Down
3 changes: 2 additions & 1 deletion components/com_contact/src/Controller/ContactController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ private function _sendEmail($data, $contact, $emailCopyToSender)
$mailer->addRecipient($contact->email_to);
$mailer->setReplyTo($templateData['email'], $templateData['name']);
$mailer->addTemplateData($templateData);
$mailer->addUnsafeTags(['name', 'email', 'body', 'customfields']);
$mailer->addUnsafeTags(['name', 'email', 'body']);
$sent = $mailer->send();

// If we are supposed to copy the sender, do so.
Expand All @@ -292,6 +292,7 @@ private function _sendEmail($data, $contact, $emailCopyToSender)
$mailer->addRecipient($templateData['email']);
$mailer->setReplyTo($templateData['email'], $templateData['name']);
$mailer->addTemplateData($templateData);
$mailer->addUnsafeTags(['name', 'email', 'body']);
$sent = $mailer->send();
}
} catch (MailDisabledException | phpMailerException $exception) {
Expand Down
1 change: 1 addition & 0 deletions components/com_users/src/Model/RegistrationModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,7 @@ public function register($temp)
$mailer = new MailTemplate('com_users.registration.admin.new_notification', $app->getLanguage()->getTag());
$mailer->addTemplateData($data);
$mailer->addRecipient($row->email);
$mailer->addUnsafeTags(['username', 'name']);
$return = $mailer->send();
} catch (\Exception $exception) {
try {
Expand Down
8 changes: 4 additions & 4 deletions libraries/src/Cache/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,10 +682,10 @@ public static function makeId()

// Platform defaults
$defaulturlparams = [
'format' => 'WORD',
'option' => 'WORD',
'view' => 'WORD',
'layout' => 'WORD',
'format' => 'CMD',
'option' => 'CMD',
'view' => 'CMD',
'layout' => 'CMD',
'tpl' => 'CMD',
'id' => 'STRING',
];
Expand Down
8 changes: 4 additions & 4 deletions libraries/src/Pagination/Pagination.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,10 +665,10 @@ protected function _buildDataObject()

// Platform defaults
$defaultUrlParams = [
'format' => 'WORD',
'option' => 'WORD',
'controller' => 'WORD',
'view' => 'WORD',
'format' => 'CMD',
'option' => 'CMD',
'controller' => 'CMD',
'view' => 'CMD',
'layout' => 'STRING',
'task' => 'CMD',
'template' => 'CMD',
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ final class Version
* @var string
* @since 3.5
*/
public const RELTIME = '08:31';
public const RELTIME = '18:31';

/**
* Release timezone.
Expand Down
10 changes: 5 additions & 5 deletions plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@ private function getPhpSupport()
],
'8.1' => [
'security' => '2023-11-25',
'eos' => '2024-11-25',
'eos' => '2025-12-31',
],
'8.2' => [
'security' => '2024-12-08',
'eos' => '2025-12-08',
'security' => '2024-12-31',
'eos' => '2026-12-31',
],
'8.3' => [
'security' => '2025-11-23',
'eos' => '2026-11-23',
'security' => '2025-12-31',
'eos' => '2027-12-31',
],
];

Expand Down