Merge pull request #13 from joomla/4.4-dev

merge head repository
muhme · Aug 23, 2024 · c3e6f8d · c3e6f8d
2 parents 9b0f6c1 + 129bd28
commit c3e6f8d
Show file tree

Hide file tree

Showing 31 changed files with 274 additions and 141 deletions.
diff --git a/administrator/components/com_users/src/Model/UserModel.php b/administrator/components/com_users/src/Model/UserModel.php
@@ -265,6 +265,15 @@ public function save($data)
             }
         }
 
+        // Unset the username if it should not be overwritten
+        if (
+            !$my->authorise('core.manage', 'com_users')
+            && (int) $user->id === (int) $my->id
+            && !ComponentHelper::getParams('com_users')->get('change_login_name')
+        ) {
+            unset($data['username']);
+        }
+
         // Bind the data.
         if (!$user->bind($data)) {
             $this->setError($user->getError());

diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -2,8 +2,8 @@
 <extension client="administrator" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>4.4.7</version>
-	<creationDate>2024-07</creationDate>
+	<version>4.4.9</version>
+	<creationDate>2024-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="administrator">
 	<name>English (en-GB)</name>
-	<version>4.4.7</version>
-	<creationDate>2024-07</creationDate>
+	<version>4.4.9</version>
+	<creationDate>2024-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>4.4.7-dev</version>
-	<creationDate>2024-07</creationDate>
+	<version>4.4.9-dev</version>
+	<creationDate>2024-08</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>

diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
@@ -2,8 +2,8 @@
 <extension type="package" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>4.4.7.1</version>
-	<creationDate>2024-07</creationDate>
+	<version>4.4.9.1</version>
+	<creationDate>2024-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml
@@ -2,8 +2,8 @@
 <extension client="api" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>4.4.7</version>
-	<creationDate>2024-07</creationDate>
+	<version>4.4.9</version>
+	<creationDate>2024-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="api">
 	<name>English (en-GB)</name>
-	<version>4.4.7</version>
-	<creationDate>2024-07</creationDate>
+	<version>4.4.9</version>
+	<creationDate>2024-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/build/media_source/templates/administrator/atum/js/template.es6.js b/build/media_source/templates/administrator/atum/js/template.es6.js
@@ -242,3 +242,20 @@ window.addEventListener('joomla:menu-toggle', (event) => {
     changeLogo(event.detail);
   }
 });
+
+/**
+ * Close any open data-bs-toggle="collapse" when opening a data-bs-toggle="dropdown"
+ *
+ * @since 4.4
+ */
+document.querySelectorAll('[data-bs-toggle="dropdown"]').forEach((button) => {
+  button.addEventListener('click', () => {
+    document.querySelectorAll('[data-bs-toggle="collapse"]').forEach((cb) => {
+      const target = document.querySelector(cb.getAttribute('data-bs-target'));
+      const collapseMenu = bootstrap.Collapse.getInstance(target) || new bootstrap.Collapse(target, {
+        toggle: false,
+      });
+      collapseMenu.hide();
+    });
+  });
+});
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss
@@ -204,6 +204,10 @@
     .fas {
       font-size: 1.5rem;
     }
+
+    > * {
+      pointer-events: none;
+    }
   }
 
   .container-search {

diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss
@@ -119,6 +119,10 @@
     &.btn {
       padding-inline-end: 0;
     }
+
+    > * {
+      pointer-events: none;
+    }
   }
 
   .btn-group:not(:last-child) > .dropdown-toggle-split {

diff --git a/components/com_contact/src/Controller/ContactController.php b/components/com_contact/src/Controller/ContactController.php
@@ -271,6 +271,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']);
             $sent = $mailer->send();
 
             // If we are supposed to copy the sender, do so.

diff --git a/components/com_content/src/View/Archive/HtmlView.php b/components/com_content/src/View/Archive/HtmlView.php
@@ -115,6 +115,7 @@ class HtmlView extends BaseHtmlView
      */
     public function display($tpl = null)
     {
+        $app        = Factory::getApplication();
         $user       = $this->getCurrentUser();
         $state      = $this->get('State');
         $items      = $this->get('Items');
@@ -219,6 +220,8 @@ public function display($tpl = null)
         $this->pagination = &$pagination;
         $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->_prepareDocument();
 

diff --git a/components/com_finder/src/View/Search/HtmlView.php b/components/com_finder/src/View/Search/HtmlView.php
@@ -153,6 +153,28 @@ public function display($tpl = null)
         // Flag indicates to not add limitstart=0 to URL
         $this->pagination->hideEmptyLimitstart = true;
 
+        // Add additional parameters
+        $queryParameterList = [
+            'f'  => 'int',
+            't'  => 'array',
+            'q'  => 'string',
+            'l'  => 'cmd',
+            'd1' => 'string',
+            'd2' => 'string',
+            'w1' => 'string',
+            'w2' => 'string',
+        ];
+
+        foreach ($queryParameterList as $parameter => $filter) {
+            $value = $app->input->get($parameter, null, $filter);
+
+            if (is_null($value)) {
+                continue;
+            }
+
+            $this->pagination->setAdditionalUrlParam($parameter, $value);
+        }
+
         // Check for errors.
         if (count($errors = $this->get('Errors'))) {
             throw new GenericDataException(implode("\n", $errors), 500);

diff --git a/components/com_users/src/Model/RegistrationModel.php b/components/com_users/src/Model/RegistrationModel.php
@@ -508,6 +508,7 @@ public function register($temp)
             $mailer = new MailTemplate($mailtemplate, $app->getLanguage()->getTag());
             $mailer->addTemplateData($data);
             $mailer->addRecipient($data['email']);
+            $mailer->addUnsafeTags(['username', 'password_clear', 'name']);
             $return = $mailer->send();
         } catch (\Exception $exception) {
             try {

diff --git a/composer.json b/composer.json
@@ -54,7 +54,7 @@
     "joomla/database": "^2.1.1",
     "joomla/di": "^2.0.1",
     "joomla/event": "^2.0.2",
-    "joomla/filter": "^2.0.4",
+    "joomla/filter": "^2.0.5",
     "joomla/filesystem": "^2.0.2",
     "joomla/http": "^2.0.4",
     "joomla/input": "^2.0.4",

diff --git a/composer.lock b/composer.lock
diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (United Kingdom)</name>
-	<version>4.4.7</version>
-	<creationDate>2024-07</creationDate>
+	<version>4.4.9</version>
+	<creationDate>2024-08</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
@@ -2,8 +2,8 @@
 <extension client="site" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>4.4.7</version>
-	<creationDate>2024-07</creationDate>
+	<version>4.4.9</version>
+	<creationDate>2024-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="site">
 	<name>English (en-GB)</name>
-	<version>4.4.7</version>
-	<creationDate>2024-07</creationDate>
+	<version>4.4.9</version>
+	<creationDate>2024-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/layouts/joomla/form/field/text.php b/layouts/joomla/form/field/text.php
@@ -95,7 +95,7 @@
     !empty($pattern) ? 'pattern="' . $pattern . '"' : '',
 
     // @TODO add a proper string here!!!
-    !empty($validationtext) ? 'data-validation-text="' . $validationtext . '"' : '',
+    !empty($validationtext) ? 'data-validation-text="' . $this->escape(Text::_($validationtext)) . '"' : '',
 ];
 
 $addonBeforeHtml = '<span class="input-group-text">' . Text::_($addonBefore) . '</span>';

diff --git a/libraries/src/Cache/Cache.php b/libraries/src/Cache/Cache.php
@@ -687,7 +687,7 @@ public static function makeId()
             'view'   => 'WORD',
             'layout' => 'WORD',
             'tpl'    => 'CMD',
-            'id'     => 'INT',
+            'id'     => 'STRING',
         ];
 
         // Use platform defaults if parameter doesn't already exist.
-Original file line number
+Diff line change
@@ Expand Up / @@ -204,6 +204,10 @@ @@
         .fas {
           font-size: 1.5rem;
         }
+        > * {
+          pointer-events: none;
+        }
       }
       .container-search {
@@ Expand Down @@