Skip to content

Commit f548ea8

Browse files
HackwarHackwar
committed
Merge branch 'refs/heads/5.1-dev' into 51-52-upmerge-20240828
# Conflicts: # administrator/language/en-GB/install.xml # administrator/language/en-GB/langmetadata.xml # administrator/manifests/files/joomla.xml # administrator/manifests/packages/pkg_en-GB.xml # api/language/en-GB/install.xml # api/language/en-GB/langmetadata.xml # installation/language/en-GB/langmetadata.xml # language/en-GB/install.xml # language/en-GB/langmetadata.xml # libraries/src/Version.php # package-lock.json # package.json
2 parents 153b66d + cb23f07 commit f548ea8

File tree

60 files changed

+160
-119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+160
-119
lines changed

‎.github/workflows/create-translation-pull-request-v4.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Create translation pull request
1+
name: Create translation pull request J4
22

33
on:
44
push:

‎components/com_contact/src/Controller/ContactController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ private function _sendEmail($data, $contact, $emailCopyToSender)
283283
$mailer->addRecipient($contact->email_to);
284284
$mailer->setReplyTo($templateData['email'], $templateData['name']);
285285
$mailer->addTemplateData($templateData);
286-
$mailer->addUnsafeTags(['name', 'email', 'body', 'customfields']);
286+
$mailer->addUnsafeTags(['name', 'email', 'body']);
287287
$sent = $mailer->send();
288288

289289
// If we are supposed to copy the sender, do so.
@@ -292,6 +292,7 @@ private function _sendEmail($data, $contact, $emailCopyToSender)
292292
$mailer->addRecipient($templateData['email']);
293293
$mailer->setReplyTo($templateData['email'], $templateData['name']);
294294
$mailer->addTemplateData($templateData);
295+
$mailer->addUnsafeTags(['name', 'email', 'body']);
295296
$sent = $mailer->send();
296297
}
297298
} catch (MailDisabledException | phpMailerException $exception) {

‎components/com_content/src/View/Archive/HtmlView.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public function display($tpl = null)
221221
$this->pagination->setAdditionalUrlParam('month', $state->get('filter.month'));
222222
$this->pagination->setAdditionalUrlParam('year', $state->get('filter.year'));
223223
$this->pagination->setAdditionalUrlParam('filter-search', $state->get('list.filter'));
224-
$this->pagination->setAdditionalUrlParam('catid', $app->input->get('catid', [], 'array'));
224+
$this->pagination->setAdditionalUrlParam('catid', $app->getInput()->get->get('catid', [], 'array'));
225225

226226
$this->_prepareDocument();
227227

‎components/com_finder/src/View/Search/HtmlView.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ public function display($tpl = null)
154154
// Flag indicates to not add limitstart=0 to URL
155155
$this->pagination->hideEmptyLimitstart = true;
156156

157+
$input = $app->getInput()->get;
158+
157159
// Add additional parameters
158160
$queryParameterList = [
159161
'f' => 'int',
@@ -164,10 +166,12 @@ public function display($tpl = null)
164166
'd2' => 'string',
165167
'w1' => 'string',
166168
'w2' => 'string',
169+
'o' => 'word',
170+
'od' => 'word',
167171
];
168172

169173
foreach ($queryParameterList as $parameter => $filter) {
170-
$value = $app->input->get($parameter, null, $filter);
174+
$value = $input->get($parameter, null, $filter);
171175

172176
if (\is_null($value)) {
173177
continue;

‎components/com_users/src/Model/RegistrationModel.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,7 @@ public function register($temp)
559559
$mailer = new MailTemplate('com_users.registration.admin.new_notification', $app->getLanguage()->getTag());
560560
$mailer->addTemplateData($data);
561561
$mailer->addRecipient($row->email);
562+
$mailer->addUnsafeTags(['username', 'name']);
562563
$return = $mailer->send();
563564
} catch (\Exception $exception) {
564565
try {

‎installation/language/af-ZA/langmetadata.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metafile client="installation">
33
<name>Afrikaans (Suid-Afrika)</name>
4-
<version>5.1.3</version>
5-
<creationDate>2024-07</creationDate>
4+
<version>5.1.4</version>
5+
<creationDate>2024-08</creationDate>
66
<author>Afrikaans Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/ar-AA/langmetadata.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metafile client="installation">
33
<name>Arabic (اللغة العربية)</name>
4-
<version>5.1.3</version>
5-
<creationDate>2024-07</creationDate>
4+
<version>5.1.4</version>
5+
<creationDate>2024-08</creationDate>
66
<author>Dr. Ashraf Damra</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/be-BY/langmetadata.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metafile client="installation">
33
<name>Belarusian (Belarus)</name>
4-
<version>5.1.3</version>
5-
<creationDate>2024-07</creationDate>
4+
<version>5.1.4</version>
5+
<creationDate>2024-08</creationDate>
66
<author>Joomla Belarus Community</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/bg-BG/langmetadata.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metafile client="installation">
33
<name>Bulgarian (bg-BG)</name>
4-
<version>5.1.3</version>
5-
<creationDate>2024-07</creationDate>
4+
<version>5.1.4</version>
5+
<creationDate>2024-08</creationDate>
66
<author>Joomla! Bulgaria</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

‎installation/language/ca-ES/langmetadata.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metafile client="installation">
33
<name>Catalan (ca-ES)</name>
4-
<version>5.1.3</version>
5-
<creationDate>2024-07</creationDate>
4+
<version>5.1.4</version>
5+
<creationDate>2024-08</creationDate>
66
<author>Catalan [ca-ES] Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

0 commit comments

Comments
 (0)