joomla · laoneo · Feb 7, 2025 · Jan 24, 2025 · Jan 24, 2025 · Jan 25, 2025
diff --git a/README.md b/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)
 

diff --git a/README.txt b/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:

diff --git a/administrator/components/com_admin/sql/updates/mysql/5.2.3-2025-01-09.sql b/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';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.2.3-2025-01-09.sql b/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';
diff --git a/administrator/language/en-GB/com_actionlogs.ini b/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"

diff --git a/administrator/language/en-GB/com_media.ini b/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!"

diff --git a/administrator/language/en-GB/guidedtours.joomla_guidedtoursteps_steps.ini b/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."

diff --git a/build/media_source/com_media/scss/components/_media-breadcrumb.scss b/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 {

diff --git a/components/com_tags/src/Service/Router.php b/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)) {

diff --git a/installation/sql/mysql/supports.sql b/installation/sql/mysql/supports.sql
@@ -416,7 +416,7 @@ INSERT INTO `#__mail_templates` (`template_id`, `extension`, `language`, `subjec
 ('com_users.reminder', 'com_users','', 'COM_USERS_EMAIL_USERNAME_REMINDER_SUBJECT', 'COM_USERS_EMAIL_USERNAME_REMINDER_BODY', '', '', '{"tags":["name","username","sitename","email","link_text","link_html"]}'),
 ('plg_task_updatenotification.mail', 'plg_task_updatenotification', '', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_SUBJECT', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_BODY', '', '', '{"tags":["newversion","curversion","sitename","url","link","releasenews"]}'),
 ('plg_user_joomla.mail', 'plg_user_joomla', '', 'PLG_USER_JOOMLA_NEW_USER_EMAIL_SUBJECT', 'PLG_USER_JOOMLA_NEW_USER_EMAIL_BODY', '', '', '{"tags":["name","sitename","url","username","password","email"]}'),
-('com_actionlogs.notification', 'com_actionlogs', '', 'COM_ACTIONLOGS_EMAIL_SUBJECT', 'COM_ACTIONLOGS_EMAIL_BODY', 'COM_ACTIONLOGS_EMAIL_HTMLBODY', '', '{"tags":["message","date","extension","username"]}'),
+('com_actionlogs.notification', 'com_actionlogs', '', 'COM_ACTIONLOGS_EMAIL_SUBJECT', 'COM_ACTIONLOGS_EMAIL_BODY', 'COM_ACTIONLOGS_EMAIL_HTMLBODY', '', '{"tags":["messages","message","date","extension","username"]}'),
 ('com_privacy.userdataexport', 'com_privacy', '', 'COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_SUBJECT', 'COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_BODY', '', '', '{"tags":["sitename","url"]}'),
 ('com_privacy.notification.export', 'com_privacy', '', 'COM_PRIVACY_EMAIL_REQUEST_SUBJECT_EXPORT_REQUEST', 'COM_PRIVACY_EMAIL_REQUEST_BODY_EXPORT_REQUEST', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),
 ('com_privacy.notification.remove', 'com_privacy', '', 'COM_PRIVACY_EMAIL_REQUEST_SUBJECT_REMOVE_REQUEST', 'COM_PRIVACY_EMAIL_REQUEST_BODY_REMOVE_REQUEST', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),

diff --git a/installation/sql/postgresql/supports.sql b/installation/sql/postgresql/supports.sql
@@ -427,7 +427,7 @@ INSERT INTO "#__mail_templates" ("template_id", "extension", "language", "subjec
 ('com_users.reminder', 'com_users', '', 'COM_USERS_EMAIL_USERNAME_REMINDER_SUBJECT', 'COM_USERS_EMAIL_USERNAME_REMINDER_BODY', '', '', '{"tags":["name","username","sitename","email","link_text","link_html"]}'),
 ('plg_task_updatenotification.mail', 'plg_task_updatenotification', '', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_SUBJECT', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_BODY', '', '', '{"tags":["newversion","curversion","sitename","url","link","releasenews"]}'),
 ('plg_user_joomla.mail', 'plg_user_joomla', '', 'PLG_USER_JOOMLA_NEW_USER_EMAIL_SUBJECT', 'PLG_USER_JOOMLA_NEW_USER_EMAIL_BODY', '', '', '{"tags":["name","sitename","url","username","password","email"]}'),
-('com_actionlogs.notification', 'com_actionlogs', '', 'COM_ACTIONLOGS_EMAIL_SUBJECT', 'COM_ACTIONLOGS_EMAIL_BODY', 'COM_ACTIONLOGS_EMAIL_HTMLBODY', '', '{"tags":["message","date","extension","username"]}'),
+('com_actionlogs.notification', 'com_actionlogs', '', 'COM_ACTIONLOGS_EMAIL_SUBJECT', 'COM_ACTIONLOGS_EMAIL_BODY', 'COM_ACTIONLOGS_EMAIL_HTMLBODY', '', '{"tags":["messages","message","date","extension","username"]}'),
 ('com_privacy.userdataexport', 'com_privacy', '', 'COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_SUBJECT', 'COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_BODY', '', '', '{"tags":["sitename","url"]}'),
 ('com_privacy.notification.export', 'com_privacy', '', 'COM_PRIVACY_EMAIL_REQUEST_SUBJECT_EXPORT_REQUEST', 'COM_PRIVACY_EMAIL_REQUEST_BODY_EXPORT_REQUEST', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),
 ('com_privacy.notification.remove', 'com_privacy', '', 'COM_PRIVACY_EMAIL_REQUEST_SUBJECT_REMOVE_REQUEST', 'COM_PRIVACY_EMAIL_REQUEST_BODY_REMOVE_REQUEST', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),

diff --git a/libraries/namespacemap.php b/libraries/namespacemap.php
@@ -144,8 +144,11 @@ protected function writeNamespaceFile($elements)
          */
         $error_reporting = error_reporting(0);
 
+        // Convert array of lines to string
+        $content = implode("\n", $content);
+
         try {
-            if (!File::write($this->file, implode("\n", $content))) {
+            if (!File::write($this->file, $content)) {
                 throw new Exception('Could not save ' . $this->file, 500);
             }
         } catch (Exception $e) {

diff --git a/libraries/src/Cache/Storage/FileStorage.php b/libraries/src/Cache/Storage/FileStorage.php
@@ -158,6 +158,11 @@ public function getAll()
             $item  = new CacheStorageHelper($folder);
 
             foreach ($files as $file) {
+                // Do not include index.html with the Number of Files
+                if ($file === 'index.html') {
+                    continue;
+                }
+
                 $item->updateSize(filesize($path . '/' . $folder . '/' . $file));
             }
 

diff --git a/libraries/src/WebAsset/WebAssetItem.php b/libraries/src/WebAsset/WebAssetItem.php
@@ -177,7 +177,10 @@ public function getUri($resolvePath = true): string
                     break;
                 default:
                     // Asset for the ES modules may give us a folder for ESM import map
-                    if (str_ends_with($path, '/') && !str_starts_with($path, '.')) {
+                    if (
+                        $this->getOption('importmap') && !$this->isPathExternal($path) &&
+                        str_ends_with($path, '/') && !str_starts_with($path, '.')
+                    ) {
                         $path = Uri::root(true) . '/' . $path;
                     }
                     break;

diff --git a/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php b/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php
@@ -147,6 +147,10 @@ private function getPhpSupport()
                 'security' => '2025-12-31',
                 'eos'      => '2027-12-31',
             ],
+            '8.4' => [
+                'security' => '2026-12-31',
+                'eos'      => '2028-12-31',
+            ],
         ];
 
         // Fill our return array with default values

diff --git a/tests/System/integration/administrator/components/com_actionlogs/Actionlogs.cy.js b/tests/System/integration/administrator/components/com_actionlogs/Actionlogs.cy.js
@@ -25,27 +25,27 @@ describe('Test in backend that the action logs', () => {
 
   it('has an export button', () => {
     cy.get('#toolbar-download1').click();
-    cy.get('#system-message-container').contains('There are no User Action logs to export').should('exist');
+    cy.checkForSystemMessage('There are no User Action logs to export');
   });
 
   it('can clear logs', () => {
     cy.get('#toolbar-delete1').click();
     cy.clickDialogConfirm(true);
-    cy.get('#system-message-container').contains('All User Action logs have been deleted').should('exist');
+    cy.checkForSystemMessage('All User Action logs have been deleted');
   });
 
   it('can delete selected logs', () => {
     cy.get('#toolbar-delete').click();
     cy.clickDialogConfirm(true);
-    cy.get('#system-message-container').contains('Please first make a selection from the list').should('exist');
+    cy.checkForSystemMessage('Please first make a selection from the list');
     cy.log('Make a selection first');
     cy.doAdministratorLogout();
     cy.doAdministratorLogin();
     cy.visit('/administrator/index.php?option=com_actionlogs&view=actionlogs');
     cy.checkAllResults();
     cy.get('#toolbar-delete').click();
     cy.clickDialogConfirm(true);
-    cy.get('#system-message-container').contains('logs deleted').should('exist');
+    cy.checkForSystemMessage('logs deleted');
     cy.task('queryDB', 'TRUNCATE #__action_logs');
   });
 });
diff --git a/tests/System/integration/administrator/components/com_banners/Banner.cy.js b/tests/System/integration/administrator/components/com_banners/Banner.cy.js
@@ -11,7 +11,7 @@ describe('Test in backend that the banners form', () => {
     cy.get('#jform_name').clear().type('Test banner');
     cy.clickToolbarButton('Save & Close');
 
-    cy.get('#system-message-container').contains('Banner saved.').should('exist');
+    cy.checkForSystemMessage('Banner saved.');
     cy.contains('Test banner');
   });
 

diff --git a/tests/System/integration/administrator/components/com_banners/Banners.cy.js b/tests/System/integration/administrator/components/com_banners/Banners.cy.js
@@ -30,7 +30,7 @@ describe('Test in backend that the banners list', () => {
       cy.clickToolbarButton('Action');
       cy.contains('Publish').click();
 
-      cy.get('#system-message-container').contains('Banner published.').should('exist');
+      cy.checkForSystemMessage('Banner published.');
     });
   });
 
@@ -42,7 +42,7 @@ describe('Test in backend that the banners list', () => {
       cy.clickToolbarButton('Action');
       cy.contains('Unpublish').click();
 
-      cy.get('#system-message-container').contains('Banner unpublished.').should('exist');
+      cy.checkForSystemMessage('Banner unpublished.');
     });
   });
 
@@ -54,7 +54,7 @@ describe('Test in backend that the banners list', () => {
       cy.clickToolbarButton('Action');
       cy.contains('Trash').click();
 
-      cy.get('#system-message-container').contains('Banner trashed.').should('exist');
+      cy.checkForSystemMessage('Banner trashed.');
     });
   });
 
@@ -67,7 +67,7 @@ describe('Test in backend that the banners list', () => {
       cy.clickToolbarButton('empty trash');
       cy.clickDialogConfirm(true);
 
-      cy.get('#system-message-container').contains('Banner deleted.').should('exist');
+      cy.checkForSystemMessage('Banner deleted.');
     });
   });
 });
diff --git a/tests/System/integration/administrator/components/com_banners/Client.cy.js b/tests/System/integration/administrator/components/com_banners/Client.cy.js
@@ -12,7 +12,7 @@ describe('Test in backend that the banner clients form', () => {
     cy.get('#jform_contact').clear().type('test banner client');
     cy.clickToolbarButton('Save & Close');
 
-    cy.get('#system-message-container').contains('Client saved.').should('exist');
+    cy.checkForSystemMessage('Client saved.');
     cy.contains('test banner client');
   });
 

diff --git a/tests/System/integration/administrator/components/com_banners/Clients.cy.js b/tests/System/integration/administrator/components/com_banners/Clients.cy.js
@@ -30,7 +30,7 @@ describe('Test in backend that the clients list', () => {
       cy.clickToolbarButton('Action');
       cy.contains('Publish').click();
 
-      cy.get('#system-message-container').contains('Client published.').should('exist');
+      cy.checkForSystemMessage('Client published.');
     });
   });
 
@@ -42,7 +42,7 @@ describe('Test in backend that the clients list', () => {
       cy.clickToolbarButton('Action');
       cy.contains('Unpublish').click();
 
-      cy.get('#system-message-container').contains('Client unpublished.').should('exist');
+      cy.checkForSystemMessage('Client unpublished.');
     });
   });
 
@@ -54,7 +54,7 @@ describe('Test in backend that the clients list', () => {
       cy.clickToolbarButton('Action');
       cy.contains('Trash').click();
 
-      cy.get('#system-message-container').contains('Client trashed.').should('exist');
+      cy.checkForSystemMessage('Client trashed.');
     });
   });
 
@@ -67,7 +67,7 @@ describe('Test in backend that the clients list', () => {
       cy.clickToolbarButton('empty trash');
       cy.clickDialogConfirm(true);
 
-      cy.get('#system-message-container').contains('Client deleted.').should('exist');
+      cy.checkForSystemMessage('Client deleted.');
     });
   });
 });
diff --git a/tests/System/integration/administrator/components/com_cache/Default.cy.js b/tests/System/integration/administrator/components/com_cache/Default.cy.js
@@ -23,11 +23,11 @@ describe('Test in backend that the cache', () => {
         cy.get('div.buttons-holder button[data-button-ok]').click();
       }
     });
-    cy.get('#system-message-container').contains('Expired cached items have been cleared').should('exist');
+    cy.checkForSystemMessage('Expired cached items have been cleared');
   });
 
   it('can delete all', () => {
     cy.get('#toolbar-delete1').click();
-    cy.get('#system-message-container').contains('All cache group(s) have been cleared').should('exist');
+    cy.checkForSystemMessage('All cache group(s) have been cleared');
   });
 });
diff --git a/tests/System/integration/administrator/components/com_categories/Categories.cy.js b/tests/System/integration/administrator/components/com_categories/Categories.cy.js
@@ -30,7 +30,7 @@ describe('Test in backend that the categories list', () => {
       cy.clickToolbarButton('Action');
       cy.contains('Publish').click();
 
-      cy.get('#system-message-container').contains('Category published.').should('exist');
+      cy.checkForSystemMessage('Category published.');
     });
   });
 
@@ -42,7 +42,7 @@ describe('Test in backend that the categories list', () => {
       cy.clickToolbarButton('Action');
       cy.contains('Unpublish').click();
 
-      cy.get('#system-message-container').contains('Category unpublished.').should('exist');
+      cy.checkForSystemMessage('Category unpublished.');
     });
   });
 
@@ -54,7 +54,7 @@ describe('Test in backend that the categories list', () => {
       cy.clickToolbarButton('Action');
       cy.contains('Trash').click();
 
-      cy.get('#system-message-container').contains('Category trashed.').should('exist');
+      cy.checkForSystemMessage('Category trashed.');
     });
   });
 
@@ -70,6 +70,6 @@ describe('Test in backend that the categories list', () => {
     cy.clickToolbarButton('empty trash');
     cy.clickDialogConfirm(true);
 
-    cy.get('#system-message-container').contains('Category deleted.').should('exist');
+    cy.checkForSystemMessage('Category deleted.');
   });
 });
diff --git a/tests/System/integration/administrator/components/com_categories/Category.cy.js b/tests/System/integration/administrator/components/com_categories/Category.cy.js
@@ -11,7 +11,7 @@ describe('Test in backend that the category form', () => {
     cy.get('#jform_title').should('exist').type('Test category');
     cy.clickToolbarButton('Save & Close');
 
-    cy.get('#system-message-container').contains('Category saved.').should('exist');
+    cy.checkForSystemMessage('Category saved.');
     cy.contains('Test category');
   });
 

diff --git a/tests/System/integration/administrator/components/com_checkin/Default.cy.js b/tests/System/integration/administrator/components/com_checkin/Default.cy.js
@@ -25,7 +25,7 @@ describe('Test in backend that the checkin', () => {
       cy.searchForItem('content');
       cy.checkAllResults();
       cy.get('#toolbar-checkin').click();
-      cy.get('#system-message-container').contains('Item checked in').should('exist');
+      cy.checkForSystemMessage('Item checked in');
     });
   });
 });
diff --git a/tests/System/integration/administrator/components/com_config/Application.cy.js b/tests/System/integration/administrator/components/com_config/Application.cy.js
@@ -22,7 +22,7 @@ describe('Test in backend that the application configuration', () => {
     cy.get('#sendtestmail').click();
 
     cy.task('getMails').then((mails) => {
-      cy.get('#system-message-container').should('contain.text', 'The email was sent to');
+      cy.checkForSystemMessage('The email was sent to');
 
       expect(mails.length).to.equal(1);
       cy.wrap(mails[0].body).should('have.string', 'This is a test mail sent using');