[5.4] Upmerge 2025-08-26

.github/CONTRIBUTING.md

@@ -15,13 +15,12 @@ You are welcome to submit a contribution for review and possible inclusion in th
 Please be patient as not all items will be viewed or tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
 
 #### Branches
-While 4.4 is in maintenance mode, ie we are still fixing bugs, PRs should be made to the `4.4-dev` branch. Merged bugfixes will be upmerged into the current 5.x branch. If a bug is only in the 5.x series the PR should be made to the current 5.x branch (currently 5.1).
+Joomla 4.4 is in security maintenance mode, until 14th October 2025, which means it will only receive security fixes. Bug fixing PRs should be made to the `5.3-dev` branch. Merged bugfixes will be upmerged into the current branches. New features that do not break backwards compatibility should be made to the `5.4-dev` branch otherwise they should be made to the `6.0-dev` branch.
 
 
 | Branch | Purpose |
 | ------ | ------- |
-| 4.4-dev | Branch for the current 4.x Joomla version. Currently in maintenance mode |
-| 5.1-dev | Branch for the current 5.x Joomla version. Bugfix only for 5.x go into this branch. |
-| 5.2-dev | Branch for the next minor 5.x Joomla version. New features go into this branch. |
+| 4.4-dev | Branch for the current 4.x Joomla version. Currently in security maintenance mode. |
+| 5.3-dev | Branch for the current 5.x Joomla version. Bugfix only for 5.x go into this branch. |
+| 5.4-dev | Branch for the next minor 5.x Joomla version. New features go into this branch. |
 | 6.0-dev | Branch for the next major Joomla version. New features that include a b/c break have to go into this branch. |
-

administrator/components/com_banners/src/Table/BannerTable.php

@@ -220,6 +220,15 @@ public function store($updateNulls = true)
     {
         $db = $this->getDatabase();
 
+        // Verify that the alias is unique
+        $table = new self($db, $this->getDispatcher());
+
+        if ($table->load(['alias' => $this->alias, 'catid' => $this->catid]) && ($table->id != $this->id || $this->id == 0)) {
+            $this->setError(Text::_('COM_BANNERS_ERROR_UNIQUE_ALIAS'));
+
+            return false;
+        }
+
         if (empty($this->id)) {
             $purchaseType = $this->purchase_type;
 
@@ -265,15 +274,6 @@ public function store($updateNulls = true)
                 $this->setError($oldrow->getError());
             }
 
-            // Verify that the alias is unique
-            $table = new self($db, $this->getDispatcher());
-
-            if ($table->load(['alias' => $this->alias, 'catid' => $this->catid]) && ($table->id != $this->id || $this->id == 0)) {
-                $this->setError(Text::_('COM_BANNERS_ERROR_UNIQUE_ALIAS'));
-
-                return false;
-            }
-
             // Store the new row
             parent::store($updateNulls);
 

administrator/components/com_media/resources/scripts/components/browser/browser.vue

@@ -154,8 +154,7 @@ export default {
       return this.$store.state.search !== '' && this.localItems.length === 0;
     },
     isEmpty() {
-      return ![...this.$store.getters.getSelectedDirectoryDirectories, ...this.$store.getters.getSelectedDirectoryFiles].length
-       && !this.$store.state.isLoading;
+      return !this.localItems.length && !this.$store.state.isLoading;
     },
     /* The styles for the media-browser element */
     listView() {

administrator/language/en-GB/com_config.ini

@@ -142,7 +142,7 @@ COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_LABEL="Persistent Memcache(d)"
 COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL="Memcache(d) Server Port"
 COM_CONFIG_FIELD_METAAUTHOR_LABEL="Author Meta Tag"
 COM_CONFIG_FIELD_METADESC_LABEL="Site Meta Description"
-COM_CONFIG_FIELD_METAVERSION_DESC="Controls whether the <code>generator</code> meta tag in the HTML document's header in the front-end and in Atom feeds includes the exact version of your Joomla site. It is recommended to hide it for security reasons."
+COM_CONFIG_FIELD_METAVERSION_DESC="Controls whether the <code>generator</code> meta tag in the HTML document's header in the frontend and in Atom feeds includes the exact version of your Joomla site. It is recommended to hide it for security reasons."
 COM_CONFIG_FIELD_METAVERSION_LABEL="Joomla Version"
 COM_CONFIG_FIELD_OFFLINE_IMAGE_LABEL="Offline Image"
 COM_CONFIG_FIELD_OFFLINE_MESSAGE_LABEL="Custom Message"

build/media_source/system/js/fields/calendar.es5.js

@@ -779,16 +779,27 @@
 					cell.colSpan = 1;
 				}
 
-				H.addEventListener("change", function (event) {
-					self.updateTime(event.target.parentNode.parentNode.childNodes[1].childNodes[0].value,
-						event.target.parentNode.parentNode.childNodes[2].childNodes[0].value,
-						event.target.parentNode.parentNode.childNodes[3].childNodes[0].value);
-				}, false);
-				M.addEventListener("change", function (event) {
-					self.updateTime(event.target.parentNode.parentNode.childNodes[1].childNodes[0].value,
-						event.target.parentNode.parentNode.childNodes[2].childNodes[0].value,
-						event.target.parentNode.parentNode.childNodes[3].childNodes[0].value);
-				}, false);
+				if (self.params.weekNumbers) {
+					H.addEventListener("change", function (event) {
+						self.updateTime(event.target.parentNode.parentNode.childNodes[1].childNodes[0].value,
+							event.target.parentNode.parentNode.childNodes[2].childNodes[0].value,
+							event.target.parentNode.parentNode.childNodes[3].childNodes[0].value);
+					}, false);
+					M.addEventListener("change", function (event) {
+						self.updateTime(event.target.parentNode.parentNode.childNodes[1].childNodes[0].value,
+							event.target.parentNode.parentNode.childNodes[2].childNodes[0].value,
+							event.target.parentNode.parentNode.childNodes[3].childNodes[0].value);
+					}, false);
+				} else {
+					H.addEventListener("change", function (event) {
+						self.updateTime(event.target.parentNode.parentNode.childNodes[1].childNodes[0].value,
+							event.target.parentNode.parentNode.childNodes[2].childNodes[0].value);
+					}, false);
+					M.addEventListener("change", function (event) {
+						self.updateTime(event.target.parentNode.parentNode.childNodes[1].childNodes[0].value,
+							event.target.parentNode.parentNode.childNodes[2].childNodes[0].value);
+					}, false);
+				}
 			})();
 		}
 

build/media_source/templates/site/cassiopeia/js/mod_menu/menu-metismenu.es6.js

@@ -6,17 +6,17 @@
  * @since       4.0.0
  */
 
-document.addEventListener('DOMContentLoaded', () => {
-  document.querySelectorAll('ul.mod-menu_dropdown-metismenu').forEach((menu) => {
-    const mm = new MetisMenu(menu, {
-      triggerElement: 'button.mm-toggler',
-    }).on('shown.metisMenu', (event) => {
-      window.addEventListener('click', function mmClick(e) {
-        if (!event.target.contains(e.target)) {
-          mm.hide(event.detail.shownElement);
+document.querySelectorAll('ul.mod-menu_dropdown-metismenu').forEach((menu) => {
+  const mm = new MetisMenu(menu, {
+    triggerElement: 'button.mm-toggler',
+  }).on('shown.metisMenu', (event) => {
+    window.addEventListener('click', function mmClick(e) {
+      if (!event.target.contains(e.target)) {
+        mm.addEventListener('hidden.metisMenu', () => {
           window.removeEventListener('click', mmClick);
-        }
-      });
+        });
+        mm.hide(event.detail.shownElement);
+      }
     });
   });
 });

components/com_tags/src/Service/Router.php

@@ -363,6 +363,8 @@ protected function buildLookup()
         $items     = $this->app->getMenu()->getItems(['component_id'], [$component->id]);
 
         foreach ($items as $item) {
+            $itemParams = $item->getParams();
+
             if (!isset($this->lookup[$item->language])) {
                 $this->lookup[$item->language] = ['tags' => [], 'tag' => []];
             }
@@ -372,8 +374,11 @@ protected function buildLookup()
                 sort($id);
                 $this->lookup[$item->language]['tag'][implode(',', $id)] = $item->id;
 
-                foreach ($id as $i) {
-                    $this->lookup[$item->language]['tag'][$i] = $item->id;
+                // Only apply to menu items with match type any
+                if ($itemParams->get('return_any_or_all') == 1) {
+                    foreach ($id as $i) {
+                        $this->lookup[$item->language]['tag'][$i] = $item->id;
+                    }
                 }
             }
 

installation/language/af-ZA/joomla.ini

@@ -84,7 +84,6 @@ INSTL_DATABASE_NO_SCHEMA="Geen databasisskema bestaan ​​vir hierdie tipe dat
 INSTL_DATABASE_PASSWORD_DESC="Voer die databasiswagwoord in wat jy geskep het of die wagwoord wat deur jou gasheer verskaf is."
 INSTL_DATABASE_PREFIX_DESC="Voer 'n tabelvoorvoegsel in of gebruik die lukraak gegenereerde een."
 INSTL_DATABASE_PREFIX_DUPLICATE_DESC="As jy 'n bestaande databasis met tabelle met dieselfde voorvoegsel gebruik, sal Joomla daardie bestaande tabelle hernoem deur die voorvoegsel \"bak_\" by te voeg."
-INSTL_DATABASE_PREFIX_MSG="Die tabelvoorvoegsel moet met 'n letter begin, optioneel gevolg deur alfanumeriese karakters en 'n onderstreep karakter"
 INSTL_DATABASE_RESPONSE_ERROR="Die installasieproses het misluk."
 INSTL_DATABASE_TYPE_DESC="Kies die tipe databasis."
 INSTL_DATABASE_USER_DESC="Voer die databasisgebruikersnaam in wat jy geskep het of die gebruikersnaam wat deur jou gasheer verskaf is."

installation/language/af-ZA/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Afrikaans (Suid-Afrika)</name>
-	<version>5.3.3</version>
+	<version>5.3.4</version>
 	<creationDate>2025-08</creationDate>
 	<author>Afrikaans Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/ar-AA/joomla.ini

@@ -84,7 +84,6 @@ INSTL_DATABASE_NO_SCHEMA="لايوجد مخطط لقاعدة البيانات م
 INSTL_DATABASE_PASSWORD_DESC="أدخل كلمة مرور قاعدة البيانات التي قمت بإنشائها أو كلمة المرور المقدمة من مزود خدمة الاستضافة الخاص بك."
 INSTL_DATABASE_PREFIX_DESC="قم باختيار بادئة الجداول او يتم اختيارها عشوائيا.<strong> المستحسن, ان يكون عدد الحروف اربعة أو خمسة, تحتوي على حروف فقط, و يفترض ان تكون النهاية بالسطر السفلي. يجب التأكد أن البادئة ليست مستعملة لصفوف اخرى في قاعدة البيانات</strong>."
 INSTL_DATABASE_PREFIX_DUPLICATE_DESC="إذا كنت تستخدم قاعدة بيانات موجودة مع جداول بنفس البادئة، سيقوم جوملا بإعادة تسمية الجداول الموجودة وذلك بإضافة البادئة \"bak_\"."
-INSTL_DATABASE_PREFIX_MSG="بادئة الجداول يجب أن تبدأ بحرف، يتبعه عدد اختياري من الحروف والأرقام وينتهي بالشرطة السفلية(_)."
 INSTL_DATABASE_RESPONSE_ERROR="فشلت عملية التنصيب."
 INSTL_DATABASE_TYPE_DESC="هذه على الأرجح \"MySQLi\""
 INSTL_DATABASE_USER_DESC="أدخل اسم مستخدم قاعدة البيانات التي قمت بإنشائها أو اسم المستخدم الذي حصلت عليه من مزود خدمة الاستضافة الخاص بك."

installation/language/ar-AA/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Arabic (اللغة العربية)</name>
-	<version>5.3.3</version>
+	<version>5.3.4</version>
 	<creationDate>2025-08</creationDate>
 	<author>Joomla! Project (Arabic Translation Team)</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/be-BY/joomla.ini

@@ -84,7 +84,6 @@ INSTL_DATABASE_NO_SCHEMA="Не існуе схемы базы даных для
 INSTL_DATABASE_PASSWORD_DESC="Пароль да базы даных, які створаны Вамі або Вашым хостынг-правайдарам:"
 INSTL_DATABASE_PREFIX_DESC="Прэфікс табліц або скарыстайцеся выпадкова створаным:"
 INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Калі ўжо выкарыстоўваецца база даных з табліцамі з тым жа прэфіксам, Joomla зменіць назву яе табліц, дадаўшы прэфікс \"bak_\"."
-INSTL_DATABASE_PREFIX_MSG="Прэфікс табліц павінен пачынацца з літары і можа змяшчаць толькі лічбы, лацінскія літары і знак падкрэслення."
 INSTL_DATABASE_RESPONSE_ERROR="Не ўдалося завяршыць усталяванне."
 INSTL_DATABASE_TYPE_DESC="Выберыце тып базы даных"
 INSTL_DATABASE_USER_DESC="Імя карыстальніка БД, створанае Вамі або Вашым хостынг-правайдарам."

installation/language/be-BY/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Belarusian (Belarus)</name>
-	<version>5.3.3</version>
+	<version>5.3.4</version>
 	<creationDate>2025-08</creationDate>
 	<author>Joomla Belarus Community</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/bg-BG/joomla.ini

@@ -84,7 +84,6 @@ INSTL_DATABASE_NO_SCHEMA="Не съществува схема за избран
 INSTL_DATABASE_PASSWORD_DESC="Въведете парола която сте създали или е предоставена от хостинга Ви."
 INSTL_DATABASE_PREFIX_DESC="Въведете префикс на таблица или използвайте произволно генерирания."
 INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Ако използвате съществуваща база данни с таблици със същия префикс, Joomla ще преименува тези съществуващи таблици, като добави префикса \"bak_\"."
-INSTL_DATABASE_PREFIX_MSG="Префиксът на таблицата трябва да започва с буква и по избор да бъде последван от буквено -цифрови знаци и долна черта"
 INSTL_DATABASE_RESPONSE_ERROR="Инсталирането е неуспешно."
 INSTL_DATABASE_TYPE_DESC="Изберете тип база данни."
 INSTL_DATABASE_USER_DESC="Потребителско име, което сте създали или което Ви е предоставено от хостинга."

installation/language/bg-BG/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Bulgarian (bg-BG)</name>
-	<version>5.3.3</version>
+	<version>5.3.4</version>
 	<creationDate>2025-08</creationDate>
 	<author>Joomla! Bulgaria</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/ca-ES/joomla.ini

@@ -84,7 +84,6 @@ INSTL_DATABASE_NO_SCHEMA="No hi ha esquema de base de dades per a aquest tipus d
 INSTL_DATABASE_PASSWORD_DESC="Introduïu la contrasenya de la base de dades que heu creat o una contrasenya proporcionada pel vostre amfitrió."
 INSTL_DATABASE_PREFIX_DESC="Introdueix un prefix de taula o utilitza el generat aleatòriament."
 INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Si utilitzeu una base de dades existent amb taules amb el mateix prefix, Joomla canviarà el nom d'aquestes taules existents afegint el prefix \"bak_\"."
-INSTL_DATABASE_PREFIX_MSG="El prefix de taula ha de començar per una lletra, opcionalment seguit par caràcters alfanumèrics i per un guió baix"
 INSTL_DATABASE_RESPONSE_ERROR="El procés d'instal·lació ha fallat."
 INSTL_DATABASE_TYPE_DESC="Selecciona el tipus de base de dades."
 INSTL_DATABASE_USER_DESC="Introduïu el nom d'usuari de la base de dades que heu creat o un nom d'usuari proporcionat pel vostre amfitrió."

installation/language/ca-ES/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Catalan (ca-ES)</name>
-	<version>5.3.3</version>
+	<version>5.3.4</version>
 	<creationDate>2025-08</creationDate>
 	<author>Catalan [ca-ES] Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/cs-CZ/joomla.ini

@@ -84,7 +84,6 @@ INSTL_DATABASE_NO_SCHEMA="Pro tento typ databáze neexistuje žádné schéma da
 INSTL_DATABASE_PASSWORD_DESC="Zadejte heslo k databázi, které jste vytvořili, nebo heslo poskytnuté hostitelem."
 INSTL_DATABASE_PREFIX_DESC="Zadejte prefix tabulky nebo použijte náhodně vygenerovaný prefix tabulky."
 INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Pokud používáte existující databázi s tabulkami se stejnou předponou, Joomla tyto existující tabulky přejmenuje přidáním předpony \"bak_\"."
-INSTL_DATABASE_PREFIX_MSG="Předpona tabulky musí začínat písmenem, volitelně následují alfanumerické znaky a podtržítko"
 INSTL_DATABASE_RESPONSE_ERROR="Instalační proces selhal."
 INSTL_DATABASE_TYPE_DESC="Vyberte typ databáze."
 INSTL_DATABASE_USER_DESC="Zadejte uživatelské jméno databáze, které jste vytvořili, nebo uživatelské jméno poskytnuté vaším hostitelem."

installation/language/cs-CZ/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Czech (Čeština)</name>
-	<version>5.3.3</version>
+	<version>5.3.4</version>
 	<creationDate>2025-08</creationDate>
 	<author>Czech Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/cy-GB/joomla.ini

@@ -84,7 +84,6 @@ INSTL_DATABASE_NO_SCHEMA="Nid oes sgema cronfa ddata yn bodoli ar gyfer y math h
 INSTL_DATABASE_PASSWORD_DESC="Rhowch y cyfrinair cronfa ddata a grëwyd gennych chi neu gyfrinair a roddwyd gan eich lletywr."
 INSTL_DATABASE_PREFIX_DESC="Rhowch ragddodiad tabl neu defnyddiwch yr un a grëwyd ar hap."
 INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Os ydych yn defnyddio cronfa ddata sy'n bodoli'n barod gyda thablau gyda'r un rhagddodiad bydd Joomla yn ailenwi y tablau hynny drwy ychwanegu'r rhagddodiad \"bak_\"."
-INSTL_DATABASE_PREFIX_MSG="Rhaid i’r rhagddodiad tabl dechrau efo llythyren yna, yn ddewisol, ei ddilyn gan nodau alffaniwmerig a/neu tanlinell."
 INSTL_DATABASE_RESPONSE_ERROR="Mae'r broses gosod wedi methu."
 INSTL_DATABASE_TYPE_DESC="Dewiswch math y gronfa ddata."
 INSTL_DATABASE_USER_DESC="Rhowch yr enw defnyddiwr cronfa ddata a grëwyd gennych chi neu enw defnyddiwr a roddwyd gan eich lletywr."

installation/language/cy-GB/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Welsh (United Kingdom)</name>
-	<version>5.3.3</version>
+	<version>5.3.4</version>
 	<creationDate>2025-08</creationDate>
 	<author>Joomla! Project - Welsh Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/da-DK/joomla.ini

@@ -84,7 +84,6 @@ INSTL_DATABASE_NO_SCHEMA="Intet databaseskema eksisterer for denne databasetype"
 INSTL_DATABASE_PASSWORD_DESC="Angiv database adgangskoden som du oprettede eller en adgangskode som din host har leveret."
 INSTL_DATABASE_PREFIX_DESC="Angiv et tabelpræfiks eller anvend det tilfældigt genererede."
 INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Hvis du anvende en eksisterende database med tabeller med det samme præfiks, så vil Joomla omdøbe disse eksisterende tabeller ved at tilføje præfikset \"bak_\"."
-INSTL_DATABASE_PREFIX_MSG="Tabelpræfikset skal starte med et bogstav, og valgfrit efterfulgt af alfanumeriske karakterer og en underscore"
 INSTL_DATABASE_RESPONSE_ERROR="Installationsprocessen fejlede."
 INSTL_DATABASE_TYPE_DESC="Vælg databasetypen."
 INSTL_DATABASE_USER_DESC="Angiv database brugernavnet som du oprettede eller et brugernavn som din host leverede."

installation/language/da-DK/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Danish (Danmark)</name>
-	<version>5.3.3</version>
+	<version>5.3.4</version>
 	<creationDate>2025-08</creationDate>
 	<author>Danish Translation Team (Transl.: Ronny Buelund)</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>

installation/language/de-AT/langmetadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>German (Austria)</name>
-	<version>5.3.2</version>
-	<creationDate>2025-07</creationDate>
+	<version>5.3.3</version>
+	<creationDate>2025-08</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>