Closed jgerman-bot closed 3 weeks ago
New language relevant PR in upstream repo: https://github.com/joomla/joomla-cms/pull/43993 Here are the upstream changes:
New language relevant PR in upstream repo: https://github.com/joomla/joomla-cms/pull/43993 Here are the upstream changes:
Click to expand the diff!
```diff 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 a782ccae959c7..3f7b94cc8e718 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_content/src/View/Archive/HtmlView.php b/components/com_content/src/View/Archive/HtmlView.php index 2516336a77bfc..343318bd64991 100644 --- a/components/com_content/src/View/Archive/HtmlView.php +++ b/components/com_content/src/View/Archive/HtmlView.php @@ -221,7 +221,7 @@ public function display($tpl = null) $this->pagination->setAdditionalUrlParam('month', $state->get('filter.month')); $this->pagination->setAdditionalUrlParam('year', $state->get('filter.year')); $this->pagination->setAdditionalUrlParam('filter-search', $state->get('list.filter')); - $this->pagination->setAdditionalUrlParam('catid', $app->input->get('catid', [], 'array')); + $this->pagination->setAdditionalUrlParam('catid', $app->getInput()->get->get('catid', [], 'array')); $this->_prepareDocument(); diff --git a/components/com_finder/src/View/Search/HtmlView.php b/components/com_finder/src/View/Search/HtmlView.php index 69cfda0e63110..ceb6f4f31b57f 100644 --- a/components/com_finder/src/View/Search/HtmlView.php +++ b/components/com_finder/src/View/Search/HtmlView.php @@ -154,6 +154,8 @@ public function display($tpl = null) // Flag indicates to not add limitstart=0 to URL $this->pagination->hideEmptyLimitstart = true; + $input = $app->getInput()->get; + // Add additional parameters $queryParameterList = [ 'f' => 'int', @@ -164,10 +166,12 @@ public function display($tpl = null) 'd2' => 'string', 'w1' => 'string', 'w2' => 'string', + 'o' => 'word', + 'od' => 'word', ]; foreach ($queryParameterList as $parameter => $filter) { - $value = $app->input->get($parameter, null, $filter); + $value = $input->get($parameter, null, $filter); if (\is_null($value)) { continue; diff --git a/components/com_users/src/Model/RegistrationModel.php b/components/com_users/src/Model/RegistrationModel.php index ba68c842a02c5..2db462ffed2b0 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/installation/language/af-ZA/langmetadata.xml b/installation/language/af-ZA/langmetadata.xml index 23645d7bb7e7a..5127ff88b4705 100644 --- a/installation/language/af-ZA/langmetadata.xml +++ b/installation/language/af-ZA/langmetadata.xml @@ -1,8 +1,8 @@