Merge branch '5.2-dev' into 5.3-dev-upmerge-2025-02-05

Author: richard67

README.md

@@ -68,7 +68,7 @@ Do you want to improve Joomla?
 * Where to [request a feature](https://issues.joomla.org)?
 * How do you [report a bug](https://docs.joomla.org/Special:MyLanguage/Filing_bugs_and_issues) on the [Issue Tracker](https://issues.joomla.org)?
 * Get Involved: Joomla! is community developed software. [Join the community](https://volunteers.joomla.org).
-* Documentation for [Developers](https://docs.joomla.org/Special:MyLanguage/Portal:Developers).
+* Documentation for [Developers](https://manual.joomla.org/).
 * Documentation for [Web designers](https://docs.joomla.org/Special:MyLanguage/Web_designers).
 * Provide a translation for Joomla: [Joomla Crowdin Project](https://joomla.crowdin.com/cms)
 

README.txt

@@ -66,7 +66,7 @@ Joomla! CMS™
 	* Where to request a feature? https://issues.joomla.org
 	* How do you report a bug? https://docs.joomla.org/Special:MyLanguage/Filing_bugs_and_issues
 	* Get Involved: Joomla! is a community developed software. Join the community at https://volunteers.joomla.org
-	* Documentation for Developers: https://docs.joomla.org/Special:MyLanguage/Portal:Developers
+	* Documentation for Developers: https://manual.joomla.org/
 	* Documentation for Web designers: https://docs.joomla.org/Special:MyLanguage/Web_designers
 
 Copyright:

administrator/components/com_admin/sql/updates/mysql/5.2.3-2025-01-09.sql

@@ -0,0 +1,3 @@
+UPDATE `#__mail_templates`
+SET `params` = '{"tags":["messages","message","date","extension","username"]}'
+WHERE `template_id` = 'com_actionlogs.notification';

administrator/components/com_admin/sql/updates/postgresql/5.2.3-2025-01-09.sql

@@ -0,0 +1,3 @@
+UPDATE "#__mail_templates"
+SET "params" = '"tags":["messages","message","date","extension","username"]}'
+WHERE "template_id" = 'com_actionlogs.notification';

administrator/language/en-GB/com_actionlogs.ini

@@ -18,7 +18,7 @@ COM_ACTIONLOGS_DATE_RELATIVE_LABEL="Relative Date/Time"
 COM_ACTIONLOGS_DISABLED="Disabled"
 COM_ACTIONLOGS_EMAIL_BODY="Latest User Actions\n------\nThis is the latest action performed by a user on your website.\n\nAction | Date | Extension | Name\n{MESSAGES} {MESSAGE} | {DATE} | {EXTENSION} | {USERNAME} \n{/MESSAGES}"
 COM_ACTIONLOGS_EMAIL_DESC="This is the latest action performed by a user on your website."
-COM_ACTIONLOGS_EMAIL_HTMLBODY="<h1>Latest User Actions</h1>\n<h2>This is the latest action performed by a user on your website.</h2>\n<table>\n<thead>\n<th>Action</th>\n<th>Date</th>\n<th>Extension</th>\n<th>Name</th>\n</thead>\n<tbody>\n{MESSAGES}<tr>\n<td>{MESSAGE}</td>\n<td>{DATE}</td>\n<td>{EXTENSION}</td>\n<td>{USERNAME}</td>\n</tr>{/MESSAGES}\n</tbody>\n</table>"
+COM_ACTIONLOGS_EMAIL_HTMLBODY="<h1>Latest User Actions</h1>\n<h2>This is the latest action performed by a user on your website.</h2>\n{MESSAGES}<table>\n<thead>\n<th>Action</th>\n<th>Date</th>\n<th>Extension</th>\n<th>Name</th>\n</thead>\n<tbody>\n<tr>\n<td>{MESSAGE}</td>\n<td>{DATE}</td>\n<td>{EXTENSION}</td>\n<td>{USERNAME}</td>\n</tr>\n</tbody>\n</table>{/MESSAGES}"
 COM_ACTIONLOGS_EMAIL_SUBJECT="Latest User Actions"
 COM_ACTIONLOGS_ERROR_COULD_NOT_EXPORT_DATA="Could not export data."
 COM_ACTIONLOGS_EXPORT_ALL_CSV="Export All as CSV"

administrator/language/en-GB/com_media.ini

@@ -24,10 +24,10 @@ COM_MEDIA_COPY_FOLDER_DESTINATION_CAN_NOT_DELETE="Copy folder is not possible as
 COM_MEDIA_COPY_FOLDER_NOT_POSSIBLE="Copy folder is not possible"
 COM_MEDIA_CREATE_NEW_FOLDER="Create New Folder"
 COM_MEDIA_CREATE_NEW_FOLDER_ERROR="Error creating folder."
+COM_MEDIA_CREATE_NEW_FOLDER_EXISTING_FOLDER_ERROR="Folder or file name already exists."
+COM_MEDIA_CREATE_NEW_FOLDER_RELATIVE_PATH_ERROR="Use of relative paths not permitted."
 COM_MEDIA_CREATE_NEW_FOLDER_SUCCESS="Folder created."
-COM_MEDIA_CREATE_NEW_FOLDER_EXISTING_FOLDER_ERROR="Folder or file name already exists "
-COM_MEDIA_CREATE_NEW_FOLDER_RELATIVE_PATH_ERROR="Use of relative paths not permitted"
-COM_MEDIA_CREATE_NEW_FOLDER_UNEXPECTED_CHARACTER="Only Alphanumeric ,underscore(_),hyphen(-) and  peroid(.) are allowed"
+COM_MEDIA_CREATE_NEW_FOLDER_UNEXPECTED_CHARACTER="Invalid folder name. Please choose a folder name with a-z, A-Z, 0-9, ., - and _."
 COM_MEDIA_DECREASE_GRID="Decrease grid size"
 COM_MEDIA_DELETE_ERROR="Error deleting the item."
 COM_MEDIA_DELETE_NOT_POSSIBLE="Delete not possible!"

administrator/language/en-GB/guidedtours.joomla_guidedtoursteps_steps.ini

@@ -22,7 +22,7 @@ COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_POSITION_TITLE="Select the position"
 COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_POSITION_DESCRIPTION="This is the position of the popup relative to the element you target on the page. 'Centered' is used when there is no specific target."
 
 COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TARGET_TITLE="Enter the target element"
-COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TARGET_DESCRIPTION="This is the element on the page this step targets. It uses the syntax used by CSS to target an element.<br />For instance, <code>#jform_title</code> will target the element with id 'jform_title'"
+COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TARGET_DESCRIPTION="This is the element on the page this step targets. It uses the syntax used by CSS to target an element.<br>For instance, <code>#jform_title</code> will target the element with id 'jform_title'."
 
 COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TYPE_TITLE="Select the type"
 COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_STEP_TYPE_DESCRIPTION="This is the kind of step you want to create. 'Next' to allow the tour to continue without interaction, 'Redirect' to move to another page, 'Interactive' to request user input."

build/media_source/com_media/scss/components/_media-breadcrumb.scss

@@ -31,8 +31,12 @@
   }
   &:last-of-type {
     background-color: $breadcrumbs-current-bg;
+    a {
+      color: var(--body-color);
+    }
+    &::before,
     &::after {
-      border-inline-start-color: $breadcrumbs-current-bg;
+      border: none;
     }
   }
   &:hover {

components/com_tags/src/Service/Router.php

@@ -300,14 +300,33 @@ public function parse(&$segments)
             $vars['view'] = array_shift($segments);
         }
 
-        $ids = [];
+        $ids          = [];
+        $matchedAlias = false;
 
         if ($item && $item->query['view'] == 'tag') {
             $ids = $item->query['id'];
         }
 
+        // Iterate through all URL segments and try to parse tag IDs from them
         while (\count($segments)) {
             $id    = array_shift($segments);
+
+            // We have a numeric ID
+            if (!$matchedAlias && is_numeric($id)) {
+                $ids[] = $id;
+
+                // We allow more than one numeric segment in the URL
+                continue;
+            }
+
+            // We have a comma-separated list of IDs
+            if (!$matchedAlias && str_contains($id, ',')) {
+                $ids[] = $id;
+
+                // We don't allow more than one list of IDs in a URL
+                break;
+            }
+
             $slug  = $this->fixSegment($id);
 
             // We did not find the segment as a tag in the DB
@@ -316,7 +335,9 @@ public function parse(&$segments)
                 break;
             }
 
-            $ids[] = $slug;
+            // We don't want to match numeric or comma-separated segments after we matched an alias
+            $matchedAlias = true;
+            $ids[]        = $slug;
         }
 
         if (\count($ids)) {