joomla · MacJoom · Jul 21, 2023 · Aug 14, 2022 · Aug 14, 2022 · Jun 30, 2023
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -14,12 +14,12 @@ If it is a PR, include what the issue is, what the PR is addressing, testing ins
 Please be patient as not all items will be tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
 
 #### Branches
-PRs should usually be made to the `4.2-dev` branch as this contains the most recent version of the code.
+PRs should usually be made to the `4.3-dev` branch as this contains the most recent version of the code.
 There are other branches available which serve specific purposes.
 
 | Branch | Purpose |
 | ------ | ------- |
 | 3.10-dev | Branch for the Joomla 3.x series. The 3.10 series release will now only include security patches. |
-| 4.2-dev | Branch for the current minor Joomla version.|
-| 4.3-dev | Branch for the next minor Joomla version. New features go into this branch. Commits to 4.2-dev will be applied to this branch as well. |
-| 5.0-dev | Branch for the next major Joomla version. |
+| 4.3-dev | Branch for the current minor Joomla version.|
+| 4.4-dev | Branch for the next minor Joomla version. Commits to 4.3-dev will be applied to this branch as well. |
+| 5.0-dev | Branch for the next major Joomla version. New features go into this branch. |
diff --git a/administrator/components/com_content/forms/filter_featured.xml b/administrator/components/com_content/forms/filter_featured.xml
@@ -16,7 +16,7 @@
 			label="JOPTION_SELECT_STAGE"
 			class="js-select-submit-on-change"
 			activeonly="true"
-			extension="com_content"
+			extension="com_content.article"
 			>
 			<option value="">JOPTION_SELECT_STAGE</option>
 		</field>

diff --git a/administrator/components/com_fields/tmpl/fields/default.php b/administrator/components/com_fields/tmpl/fields/default.php
@@ -198,7 +198,7 @@
                     <?php // load the pagination. ?>
                     <?php echo $this->pagination->getListFooter(); ?>
 
-                    <?php //Load the batch processing form. ?>
+                    <?php // Load the batch processing form. ?>
                     <?php
                     if (
                         $user->authorise('core.create', $component)

diff --git a/administrator/components/com_fields/tmpl/groups/default.php b/administrator/components/com_fields/tmpl/groups/default.php
@@ -166,7 +166,7 @@
                     <?php // load the pagination. ?>
                     <?php echo $this->pagination->getListFooter(); ?>
 
-                    <?php //Load the batch processing form. ?>
+                    <?php // Load the batch processing form. ?>
                     <?php
                     if (
                         $user->authorise('core.create', $component)

diff --git a/administrator/components/com_templates/src/Model/TemplateModel.php b/administrator/components/com_templates/src/Model/TemplateModel.php
@@ -959,7 +959,7 @@ public function save($data)
         $data['source'] = str_replace(["\r\n", "\r"], "\n", $data['source']);
 
         // If the asset file for the template ensure we have valid template so we don't instantly destroy it
-        if ($fileName === '/joomla.asset.json' && json_decode($data['source']) === null) {
+        if (str_ends_with($fileName, '/joomla.asset.json') && json_decode($data['source']) === null) {
             $this->setError(Text::_('COM_TEMPLATES_ERROR_ASSET_FILE_INVALID_JSON'));
 
             return false;

diff --git a/administrator/modules/mod_guidedtours/tmpl/default.php b/administrator/modules/mod_guidedtours/tmpl/default.php
@@ -25,16 +25,16 @@
     ->getWebAssetManager()
     ->useScript('bootstrap.dropdown');
 
-$lang = $app->getLanguage();
-
-$extension = $app->getInput()->get('option');
-
-$listTours = [];
-$allTours = [];
+$lang       = $app->getLanguage();
+$extension  = $app->getInput()->get('option');
+$listTours  = [];
+$allTours   = [];
+$toursCount = $params->get('tourscount', 7);
 
 foreach ($tours as $tour) :
-    if (count(array_intersect(['*', $extension], $tour->extensions))) :
+    if ($toursCount > 0 && count(array_intersect(['*', $extension], $tour->extensions))) :
         $listTours[] = $tour;
+        $toursCount--;
     endif;
 
     $uri = new Uri($tour->url);
@@ -64,10 +64,7 @@
         <span class="icon-angle-down" aria-hidden="true"></span>
     </button>
     <div class="dropdown-menu dropdown-menu-end">
-        <?php foreach ($listTours as $i => $tour) : ?>
-            <?php if ($i >= $params->get('tourscount', 7)) : ?>
-                <?php break; ?>
-            <?php endif; ?>
+        <?php foreach ($listTours as $tour) : ?>
             <button type="button" class="button-start-guidedtour dropdown-item" data-id="<?php echo $tour->id ?>">
                 <span class="icon-map-signs" aria-hidden="true"></span>
                 <?php echo $tour->title; ?>

diff --git a/build/media_source/plg_system_guidedtours/js/guidedtours.es6.js b/build/media_source/plg_system_guidedtours/js/guidedtours.es6.js
@@ -374,7 +374,11 @@ function startTour(obj) {
               break;
 
             case 'button':
-              tour.next();
+              ele.addEventListener('click', () => {
+                // the button may submit a form so record the currentStepId in the session storage
+                sessionStorage.setItem('currentStepId', obj.steps[index].id + 1);
+                tour.next();
+              });
               break;
 
             case 'other':

diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss
@@ -60,8 +60,8 @@ a {
     text-decoration: underline;
   }
 
-  &:hover,
-  &:focus {
+  &:not(.btn):hover,
+  &:not(.btn):focus {
     color: var(--cassiopeia-color-hover);
   }
 

diff --git a/installation/language/af-ZA/langmetadata.xml b/installation/language/af-ZA/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>Afrikaans (Suid-Afrika)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</creationDate>
 	<author>Afrikaans Translation Team</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/installation/language/ar-AA/langmetadata.xml b/installation/language/ar-AA/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>Arabic (اللغة العربية)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</creationDate>
 	<author>Dr. Ashraf Damra</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/installation/language/bg-BG/joomla.ini b/installation/language/bg-BG/joomla.ini
@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Некоректно име на базата
 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="Изберете тип база данни."

diff --git a/installation/language/bg-BG/langmetadata.xml b/installation/language/bg-BG/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>Bulgarian (bg-BG)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</creationDate>
 	<author>Joomla! Bulgaria</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/installation/language/ca-ES/langmetadata.xml b/installation/language/ca-ES/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>Catalan (ca-ES)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</creationDate>
 	<author>Catalan Translation Team</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/installation/language/cs-CZ/langmetadata.xml b/installation/language/cs-CZ/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>Czech (Čeština)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</creationDate>
 	<author>Czech Translation Team</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/installation/language/cy-GB/langmetadata.xml b/installation/language/cy-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>Welsh (United Kingdom)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</creationDate>
 	<author>Joomla! Project - Welsh Translation Team</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/installation/language/da-DK/langmetadata.xml b/installation/language/da-DK/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>Danish (Danmark)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</creationDate>
 	<author>Danish Translation Team (Transl.: Ronny Buelund)</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/installation/language/de-LI/joomla.ini b/installation/language/de-LI/joomla.ini
@@ -156,7 +156,7 @@ INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Die Sprache mit dem Sprach-Tag „%s
 INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Standardsprache konfigurieren"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Weitere Sprachen können auch noch später in der Administration von Joomla! installiert werden."
 
-INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Deutsch (Lichtenstein)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
+INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Deutsch (Liechtenstein)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
 
 ; Database Model
 INSTL_DATABASE_COULD_NOT_CONNECT="Es konnte keine Verbindung zur Datenbank hergestellt werden. Der Konnektor gab folgenden Fehler zurück: %s."

diff --git a/installation/language/de-LI/langmetadata.xml b/installation/language/de-LI/langmetadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
-	<name>German (Lichtenstein)</name>
+	<name>German (Liechtenstein)</name>
 	<version>4.3.2</version>
 	<creationDate>2023-05</creationDate>
 	<author>J!German</author>
@@ -11,8 +11,8 @@
 		<filename>joomla.ini</filename>
 	</files>
 	<metadata>
-		<name>German (Lichtenstein)</name>
-		<nativeName>Deutsch (Lichtenstein)</nativeName>
+		<name>German (Liechtenstein)</name>
+		<nativeName>Deutsch (Liechtenstein)</nativeName>
 		<tag>de-LI</tag>
 		<rtl>0</rtl>
 	</metadata>

diff --git a/installation/language/el-GR/langmetadata.xml b/installation/language/el-GR/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>Greek (el-GR)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</creationDate>
 	<author>Ομάδα Μετάφρασης: joomla. gr</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/installation/language/en-AU/langmetadata.xml b/installation/language/en-AU/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>English (Australia)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</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/installation/language/en-CA/langmetadata.xml b/installation/language/en-CA/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>English (Canada)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</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/installation/language/en-NZ/langmetadata.xml b/installation/language/en-NZ/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>English (New Zealand)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</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/installation/language/en-US/langmetadata.xml b/installation/language/en-US/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>English (United States)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</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/installation/language/es-ES/langmetadata.xml b/installation/language/es-ES/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>Spanish (Spain)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</creationDate>
 	<author>Spanish [es-ES] Translation Team</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/installation/language/et-EE/langmetadata.xml b/installation/language/et-EE/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>Estonian</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</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/installation/language/eu-ES/langmetadata.xml b/installation/language/eu-ES/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>Basque</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</creationDate>
 	<author>Joomla! Basque Translation Team</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/installation/language/fa-AF/langmetadata.xml b/installation/language/fa-AF/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>فارسی (دری)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</creationDate>
 	<author>JoomlaPersian Translation Team</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/installation/language/fa-IR/langmetadata.xml b/installation/language/fa-IR/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>Persian (پارسی)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</creationDate>
 	<author>JoomlaFarsi.Com Team</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/installation/language/fi-FI/langmetadata.xml b/installation/language/fi-FI/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>Finnish (Suomi)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</creationDate>
 	<author>Finnish translation team: Joomla.fi</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/installation/language/fr-FR/langmetadata.xml b/installation/language/fr-FR/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>French (fr-FR)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</creationDate>
 	<author>Joomla! Project - French translation team</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/installation/language/he-IL/langmetadata.xml b/installation/language/he-IL/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>Hebrew (Israel)</name>
 	<version>4.3.3</version>
-	<creationDate>2023-05</creationDate>
+	<creationDate>2023-07</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>