diff --git a/.github/workflows/create-translation-pull-request-v4.yml b/.github/workflows/create-translation-pull-request-v4.yml index 434e1cceddf70..45eb10e652d78 100644 --- a/.github/workflows/create-translation-pull-request-v4.yml +++ b/.github/workflows/create-translation-pull-request-v4.yml @@ -1,4 +1,4 @@ -name: Create translation pull request +name: Create translation pull request J4 on: push: diff --git a/components/com_contact/src/Controller/ContactController.php b/components/com_contact/src/Controller/ContactController.php index b794196699d71..774925c5587d3 100644 --- a/components/com_contact/src/Controller/ContactController.php +++ b/components/com_contact/src/Controller/ContactController.php @@ -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. @@ -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) { diff --git a/components/com_users/src/Model/RegistrationModel.php b/components/com_users/src/Model/RegistrationModel.php index 15b4bce1a9325..5f6b71e56c2fc 100644 --- a/components/com_users/src/Model/RegistrationModel.php +++ b/components/com_users/src/Model/RegistrationModel.php @@ -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 { diff --git a/libraries/src/Cache/Cache.php b/libraries/src/Cache/Cache.php index c593b71c662ae..d0a0c025452ab 100644 --- a/libraries/src/Cache/Cache.php +++ b/libraries/src/Cache/Cache.php @@ -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', ]; diff --git a/libraries/src/Pagination/Pagination.php b/libraries/src/Pagination/Pagination.php index 48fcc85482a6c..52cbe3ad1c087 100644 --- a/libraries/src/Pagination/Pagination.php +++ b/libraries/src/Pagination/Pagination.php @@ -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', diff --git a/libraries/src/Version.php b/libraries/src/Version.php index ad53421a3557c..73b2cb083228f 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -98,7 +98,7 @@ final class Version * @var string * @since 3.5 */ - public const RELTIME = '08:31'; + public const RELTIME = '18:31'; /** * Release timezone. diff --git a/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php b/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php index f282cca9a3f94..69b27c005bb0e 100644 --- a/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php +++ b/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php @@ -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', ], ];