From 8e59dc342e91d1310c9fb78cdb8d3293e0aac155 Mon Sep 17 00:00:00 2001
From: Nicola Galgano <optimus4joomla@gmail.com>
Date: Thu, 7 Aug 2025 11:44:15 +0200
Subject: [PATCH 1/7] [5] Orphaned Ellipsis in Articles Module (#45678)

---
 libraries/src/HTML/Helpers/StringHelper.php   | 75 +++++++++----------
 .../Libraries/Cms/Html/HtmlStringTest.php     |  6 +-
 2 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/libraries/src/HTML/Helpers/StringHelper.php b/libraries/src/HTML/Helpers/StringHelper.php
index 4b521cf2f6445..2ee5da493fc33 100644
--- a/libraries/src/HTML/Helpers/StringHelper.php
+++ b/libraries/src/HTML/Helpers/StringHelper.php
@@ -40,7 +40,7 @@ abstract class StringHelper
      */
     public static function truncate($text, $length = 0, $noSplit = true, $allowHtml = true)
     {
-        // Assume a lone open tag is invalid HTML.
+        // Assume a lone open tag is invalid HTML
         if ($length === 1 && $text[0] === '<') {
             return '...';
         }
@@ -156,87 +156,80 @@ public static function truncate($text, $length = 0, $noSplit = true, $allowHtml
      */
     public static function truncateComplex($html, $maxLength = 0, $noSplit = true)
     {
-        // Start with some basic rules.
         $baseLength = \strlen($html);
 
-        // If the original HTML string is shorter than the $maxLength do nothing and return that.
-        if ($baseLength <= $maxLength || $maxLength === 0) {
+        // Early return for trivial cases
+        if ($maxLength === 0 || $baseLength <= $maxLength) {
             return $html;
         }
 
-        // Take care of short simple cases.
-        if ($maxLength <= 3 && $html[0] !== '<' && !str_contains(substr($html, 0, $maxLength - 1), '<') && $baseLength > $maxLength) {
+        // Special case: very short cutoff, plain text.
+        if ($maxLength <= 3 && $html[0] !== '<' && !str_contains(substr($html, 0, max(0, $maxLength - 1)), '<')) {
             return '...';
         }
 
-        // Deal with maximum length of 1 where the string starts with a tag.
+        // Special case: string starts with a tag and maxLength is 1
         if ($maxLength === 1 && $html[0] === '<') {
-            $endTagPos = \strlen(strstr($html, '>', true));
-            $tag       = substr($html, 1, $endTagPos);
-
-            $l = $endTagPos + 1;
-
-            if ($noSplit) {
-                return substr($html, 0, $l) . '</' . $tag . '...';
+            $endTagPos = strpos($html, '>');
+            if ($endTagPos === false) {
+                return '...';
             }
-
-            // @todo: $character doesn't seem to be used...
-            $character = substr(strip_tags($html), 0, 1);
-
-            return substr($html, 0, $l) . '</' . $tag . '...';
+            $tag = substr($html, 1, $endTagPos - 1);
+            return substr($html, 0, $endTagPos + 1) . "</$tag>...";
         }
 
-        // First get the truncated plain text string. This is the rendered text we want to end up with.
-        $ptString = HTMLHelper::_('string.truncate', $html, $maxLength, $noSplit, $allowHtml = false);
+        // Get a plain text truncated string
+        $ptString = HTMLHelper::_('string.truncate', $html, $maxLength, $noSplit, false);
 
-        // It's all HTML, just return it.
         if ($ptString === '') {
             return $html;
         }
-
-        // If the plain text is shorter than the max length the variable will not end in ...
-        // In that case we use the whole string.
         if (!str_ends_with($ptString, '...')) {
             return $html;
         }
-
-        // Regular truncate gives us the ellipsis but we want to go back for text and tags.
         if ($ptString === '...') {
             $stripped = substr(strip_tags($html), 0, $maxLength);
-            $ptString = HTMLHelper::_('string.truncate', $stripped, $maxLength, $noSplit, $allowHtml = false);
+            $ptString = HTMLHelper::_('string.truncate', $stripped, $maxLength, $noSplit, false);
         }
-
-        // We need to trim the ellipsis that truncate adds.
         $ptString = rtrim($ptString, '.');
 
-        // Now deal with more complex truncation.
         while ($maxLength <= $baseLength) {
-            // Get the truncated string assuming HTML is allowed.
-            $htmlString = HTMLHelper::_('string.truncate', $html, $maxLength, $noSplit, $allowHtml = true);
+            $htmlString = HTMLHelper::_('string.truncate', $html, $maxLength, $noSplit, true);
 
             if ($htmlString === '...' && \strlen($ptString) + 3 > $maxLength) {
-                return $htmlString;
+                return '...';
             }
 
             $htmlString = rtrim($htmlString, '.');
 
-            // Now get the plain text from the HTML string and trim it.
-            $htmlStringToPtString = HTMLHelper::_('string.truncate', $htmlString, $maxLength, $noSplit, $allowHtml = false);
+            // Get the plain text version of the truncated HTML string
+            $htmlStringToPtString = HTMLHelper::_('string.truncate', $htmlString, $maxLength, $noSplit, false);
             $htmlStringToPtString = rtrim($htmlStringToPtString, '.');
 
-            // If the new plain text string matches the original plain text string we are done.
+            // If plain text matches, we're done
             if ($ptString === $htmlStringToPtString) {
+                // Remove whitespace, non-breaking spaces, and trailing tags before the ellipsis
+                $htmlString = preg_replace('/(&nbsp;|\s)+(<\/[^>]+>)?$/u', '', $htmlString);
+
+                // If it ends with a closing tag, try to inject the ellipsis before the last closing tag
+                if (preg_match('/(<\/[^>]+>)$/', $htmlString, $matches)) {
+                    return preg_replace('/(<\/[^>]+>)$/', '...$1', $htmlString);
+                }
                 return $htmlString . '...';
             }
 
-            // Get the number of HTML tag characters in the first $maxLength characters
+            // Adjust length for HTML tags
             $diffLength = \strlen($ptString) - \strlen($htmlStringToPtString);
-
             if ($diffLength <= 0) {
+                // Remove whitespace, non-breaking spaces, and trailing tags before the ellipsis
+                $htmlString = preg_replace('/(&nbsp;|\s)+(<\/[^>]+>)?$/u', '', $htmlString);
+
+                // If it ends with a closing tag, inject the ellipsis before the last closing tag
+                if (preg_match('/(<\/[^>]+>)$/', $htmlString, $matches)) {
+                    return preg_replace('/(<\/[^>]+>)$/', '...$1', $htmlString);
+                }
                 return $htmlString . '...';
             }
-
-            // Set new $maxlength that adjusts for the HTML tags
             $maxLength += $diffLength;
         }
 
diff --git a/tests/Unit/Libraries/Cms/Html/HtmlStringTest.php b/tests/Unit/Libraries/Cms/Html/HtmlStringTest.php
index 97f50b743f4d1..4d41bbace1714 100644
--- a/tests/Unit/Libraries/Cms/Html/HtmlStringTest.php
+++ b/tests/Unit/Libraries/Cms/Html/HtmlStringTest.php
@@ -328,7 +328,7 @@ public function getTestTruncateComplexData(): array
                 '<span>Plain text</span>',
                 8,
                 true,
-                '<span>Plain</span>...',
+                '<span>Plain...</span>',
             ],
             /*
              *  @todo: Check these tests: 'Plain html over the limit splitting first word'
@@ -366,13 +366,13 @@ public function getTestTruncateComplexData(): array
                 '<div><span><i>Plain</i> <b>text</b> foo</span></div>',
                 8,
                 false,
-                '<div><span><i>Plain</i> <b>te</b></span></div>...',
+                '<div><span><i>Plain</i> <b>te</b></span>...</div>',
             ],
             'No split' => [
                 '<div><span><i>Plain</i> <b>text</b> foo</span></div>',
                 8,
                 true,
-                '<div><span><i>Plain</i></span></div>...',
+                '<div><span><i>Plain</i></span>...</div>',
             ],
             'First character is < with a maximum length of 1, no split' => [
                 '<div><span><i>Plain</i> <b>text</b> foo</span></div>',

From ca1483fe522399293a6ce143f8baea5a684dee10 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 7 Aug 2025 11:18:53 +0100
Subject: [PATCH 2/7] [5.3] Choices force background (#45842)

Signed-off-by: BrianTeeman <brian@teeman.net>
---
 .../administrator/atum/scss/vendor/choicesjs/choices.scss       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
index 95935cfa55bf6..da429f3e40688 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
+++ b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
@@ -60,7 +60,7 @@
   position: relative;
   margin: 2px;
   color: $choices-list-multiple-item; //$white;
-  background-color: $choices-list-multiple-item-bg; // var(--template-bg-dark);
+  background-color: $choices-list-multiple-item-bg !important; // var(--template-bg-dark);
   margin-inline-end: 2px;
   border: 0;
   border-radius: $border-radius;

From 5ce363ba5631564c90d6d5fcfdf5a06c8b5eee19 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Fri, 8 Aug 2025 09:40:47 +0100
Subject: [PATCH 3/7] [5.3] End of Support Notification (#45831)

---
 plugins/quickicon/eos/src/Extension/Eos.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/quickicon/eos/src/Extension/Eos.php b/plugins/quickicon/eos/src/Extension/Eos.php
index f87c5fccbaf0e..3e3505318b45a 100644
--- a/plugins/quickicon/eos/src/Extension/Eos.php
+++ b/plugins/quickicon/eos/src/Extension/Eos.php
@@ -38,7 +38,7 @@ final class Eos extends CMSPlugin implements SubscriberInterface
      * @var    string
      * @since 4.4.0
      */
-    private const EOS_DATE = '2027-10-19';
+    private const EOS_DATE = '2027-10-12';
 
     /**
      * Load the language file on instantiation.
@@ -189,7 +189,7 @@ private function getMessageInfo(int $monthsUntilEOS, int $inverted): array
                 'id'          => 5,
                 'messageText' => 'PLG_QUICKICON_EOS_MESSAGE_ERROR_SUPPORT_ENDED',
                 'messageType' => 'error',
-                'messageLink' => 'https://docs.joomla.org/Special:MyLanguage/Joomla_4.4.x_to_5.x_Planning_and_Upgrade_Step_by_Step',
+                'messageLink' => 'https://docs.joomla.org/Special:MyLanguage/Joomla_5.4.x_to_6.x_Planning_and_Upgrade_Step_by_Step',
                 'snoozable'   => false,
             ];
         }
@@ -200,7 +200,7 @@ private function getMessageInfo(int $monthsUntilEOS, int $inverted): array
                 'id'          => 4,
                 'messageText' => 'PLG_QUICKICON_EOS_MESSAGE_WARNING_SUPPORT_ENDING',
                 'messageType' => 'warning',
-                'messageLink' => 'https://docs.joomla.org/Special:MyLanguage/Joomla_4.4.x_to_5.x_Planning_and_Upgrade_Step_by_Step',
+                'messageLink' => 'https://docs.joomla.org/Special:MyLanguage/Joomla_5.4.x_to_6.x_Planning_and_Upgrade_Step_by_Step',
                 'snoozable'   => true,
             ];
         }
@@ -211,7 +211,7 @@ private function getMessageInfo(int $monthsUntilEOS, int $inverted): array
                 'id'          => 3,
                 'messageText' => 'PLG_QUICKICON_EOS_MESSAGE_WARNING_SECURITY_ONLY',
                 'messageType' => 'warning',
-                'messageLink' => 'https://docs.joomla.org/Special:MyLanguage/Joomla_4.4.x_to_5.x_Planning_and_Upgrade_Step_by_Step',
+                'messageLink' => 'https://docs.joomla.org/Special:MyLanguage/Joomla_5.4.x_to_6.x_Planning_and_Upgrade_Step_by_Step',
                 'snoozable'   => true,
             ];
         }
@@ -233,7 +233,7 @@ private function getMessageInfo(int $monthsUntilEOS, int $inverted): array
                 'id'          => 1,
                 'messageText' => 'PLG_QUICKICON_EOS_MESSAGE_INFO_01',
                 'messageType' => 'info',
-                'messageLink' => 'https://joomla.org/5',
+                'messageLink' => 'https://joomla.org/6',
                 'snoozable'   => true,
             ];
         }

From 23e460f405ac3c161da10527e3e76e2458dcbe73 Mon Sep 17 00:00:00 2001
From: Martina  Scholz <64533137+LadySolveig@users.noreply.github.com>
Date: Sun, 10 Aug 2025 17:38:27 +0200
Subject: [PATCH 4/7] [5.3] Fix strict routing for frontend forms (#45619)

---
 components/com_config/tmpl/config/default.php      | 2 +-
 components/com_config/tmpl/modules/default.php     | 2 +-
 components/com_config/tmpl/templates/default.php   | 2 +-
 components/com_contact/tmpl/form/edit.php          | 2 +-
 components/com_content/tmpl/form/edit.php          | 2 +-
 components/com_privacy/tmpl/confirm/default.php    | 2 +-
 components/com_privacy/tmpl/remind/default.php     | 2 +-
 components/com_privacy/tmpl/request/default.php    | 2 +-
 components/com_users/tmpl/captive/default.php      | 4 ++--
 components/com_users/tmpl/login/default_login.php  | 2 +-
 components/com_users/tmpl/login/default_logout.php | 2 +-
 components/com_users/tmpl/method/edit.php          | 4 ++--
 components/com_users/tmpl/profile/edit.php         | 2 +-
 components/com_users/tmpl/registration/default.php | 2 +-
 components/com_users/tmpl/remind/default.php       | 2 +-
 components/com_users/tmpl/reset/complete.php       | 2 +-
 components/com_users/tmpl/reset/confirm.php        | 2 +-
 components/com_users/tmpl/reset/default.php        | 2 +-
 libraries/src/MVC/Controller/FormController.php    | 2 +-
 19 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/components/com_config/tmpl/config/default.php b/components/com_config/tmpl/config/default.php
index 9b2fe2e561db4..7d1f5abde0863 100644
--- a/components/com_config/tmpl/config/default.php
+++ b/components/com_config/tmpl/config/default.php
@@ -34,7 +34,7 @@
         </h1>
     </div>
 <?php endif; ?>
-<form action="<?php echo Route::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate">
+<form action="<?php echo Route::_('index.php'); ?>" method="post" name="adminForm" id="application-form" class="form-validate">
 
     <div class="mb-2 d-flex">
         <button type="button" class="btn btn-sm btn-outline-info button-inlinehelp ms-auto">
diff --git a/components/com_config/tmpl/modules/default.php b/components/com_config/tmpl/modules/default.php
index dad29dbe06a27..d8a81b6948eba 100644
--- a/components/com_config/tmpl/modules/default.php
+++ b/components/com_config/tmpl/modules/default.php
@@ -42,7 +42,7 @@
 }
 ?>
 
-<form action="<?php echo Route::_('index.php?option=com_config'); ?>" method="post" name="adminForm" id="modules-form" class="form-validate">
+<form action="<?php echo Route::_('index.php'); ?>" method="post" name="adminForm" id="modules-form" class="form-validate">
     <div class="row">
         <div class="col-md-12">
             <legend><?php echo Text::_('COM_CONFIG_MODULES_SETTINGS_TITLE'); ?></legend>
diff --git a/components/com_config/tmpl/templates/default.php b/components/com_config/tmpl/templates/default.php
index 67691e50c886d..1aceabb244a44 100644
--- a/components/com_config/tmpl/templates/default.php
+++ b/components/com_config/tmpl/templates/default.php
@@ -35,7 +35,7 @@
         </h1>
     </div>
 <?php endif; ?>
-<form action="<?php echo Route::_('index.php?option=com_config'); ?>" method="post" name="adminForm" id="templates-form" class="form-validate">
+<form action="<?php echo Route::_('index.php'); ?>" method="post" name="adminForm" id="templates-form" class="form-validate">
 
     <div id="page-site" class="tab-pane active">
         <div class="row">
diff --git a/components/com_contact/tmpl/form/edit.php b/components/com_contact/tmpl/form/edit.php
index a4f254961b77c..26634cbfefbac 100644
--- a/components/com_contact/tmpl/form/edit.php
+++ b/components/com_contact/tmpl/form/edit.php
@@ -35,7 +35,7 @@
         </div>
     <?php endif; ?>
 
-    <form action="<?php echo Route::_('index.php?option=com_contact&id=' . (int) $this->item->id); ?>" method="post"
+    <form action="<?php echo Route::_('index.php'); ?>" method="post"
         name="adminForm" id="adminForm" class="form-validate form-vertical">
         <fieldset>
             <?php echo HTMLHelper::_('uitab.startTabSet', $this->tab_name, ['active' => 'details', 'recall' => true, 'breakpoint' => 768]); ?>
diff --git a/components/com_content/tmpl/form/edit.php b/components/com_content/tmpl/form/edit.php
index c447dcd6b8ccf..46d8935ed1a01 100644
--- a/components/com_content/tmpl/form/edit.php
+++ b/components/com_content/tmpl/form/edit.php
@@ -44,7 +44,7 @@
     </div>
     <?php endif; ?>
 
-    <form action="<?php echo Route::_('index.php?option=com_content&a_id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate form-vertical">
+    <form action="<?php echo Route::_('index.php'); ?>" method="post" name="adminForm" id="adminForm" class="form-validate form-vertical">
         <fieldset>
             <?php echo HTMLHelper::_('uitab.startTabSet', $this->tab_name, ['active' => 'editor', 'recall' => true, 'breakpoint' => 768]); ?>
 
diff --git a/components/com_privacy/tmpl/confirm/default.php b/components/com_privacy/tmpl/confirm/default.php
index 63ddc761de0bf..ce3c30a299411 100644
--- a/components/com_privacy/tmpl/confirm/default.php
+++ b/components/com_privacy/tmpl/confirm/default.php
@@ -30,7 +30,7 @@
             </h1>
         </div>
     <?php endif; ?>
-    <form action="<?php echo Route::_('index.php?option=com_privacy&task=request.confirm'); ?>" method="post" class="form-validate form-horizontal well">
+    <form action="<?php echo Route::_('index.php?task=request.confirm'); ?>" method="post" class="form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
                 <?php if (!empty($fieldset->label)) : ?>
diff --git a/components/com_privacy/tmpl/remind/default.php b/components/com_privacy/tmpl/remind/default.php
index c430c929eadc6..bfec2924c1639 100644
--- a/components/com_privacy/tmpl/remind/default.php
+++ b/components/com_privacy/tmpl/remind/default.php
@@ -30,7 +30,7 @@
             </h1>
         </div>
     <?php endif; ?>
-    <form action="<?php echo Route::_('index.php?option=com_privacy&task=request.remind'); ?>" method="post" class="form-validate form-horizontal well">
+        <form action="<?php echo Route::_('index.php?task=request.remind'); ?>" method="post" class="form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
                 <?php if (!empty($fieldset->label)) : ?>
diff --git a/components/com_privacy/tmpl/request/default.php b/components/com_privacy/tmpl/request/default.php
index 6604e14b88bc0..c40ca0808eecb 100644
--- a/components/com_privacy/tmpl/request/default.php
+++ b/components/com_privacy/tmpl/request/default.php
@@ -31,7 +31,7 @@
         </div>
     <?php endif; ?>
     <?php if ($this->sendMailEnabled) : ?>
-        <form action="<?php echo Route::_('index.php?option=com_privacy&task=request.submit'); ?>" method="post" class="form-validate form-horizontal well">
+        <form action="<?php echo Route::_('index.php?task=request.submit'); ?>" method="post" class="form-validate form-horizontal well">
             <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
                 <fieldset>
                     <?php if (!empty($fieldset->label)) : ?>
diff --git a/components/com_users/tmpl/captive/default.php b/components/com_users/tmpl/captive/default.php
index 231a448392239..d99864080ce8f 100644
--- a/components/com_users/tmpl/captive/default.php
+++ b/components/com_users/tmpl/captive/default.php
@@ -58,9 +58,9 @@ class="btn btn-sm btn-secondary"
         </div>
     <?php endif; ?>
 
-    <form action="<?php echo Route::_('index.php?option=com_users&task=captive.validate&record_id=' . ((int) $this->record->id)) ?>"
-            id="users-mfa-captive-form"
+    <form action="<?php echo Route::_('index.php?task=captive.validate&record_id=' . ((int) $this->record->id)) ?>"
             method="post"
+            id="users-mfa-captive-form"
             class="form-horizontal"
     >
         <?php echo HTMLHelper::_('form.token') ?>
diff --git a/components/com_users/tmpl/login/default_login.php b/components/com_users/tmpl/login/default_login.php
index 2745abaafdeb9..aa91b71090082 100644
--- a/components/com_users/tmpl/login/default_login.php
+++ b/components/com_users/tmpl/login/default_login.php
@@ -51,7 +51,7 @@
     </div>
     <?php endif; ?>
 
-    <form action="<?php echo Route::_('index.php?option=com_users&task=user.login'); ?>" method="post" class="com-users-login__form form-validate form-horizontal well" id="com-users-login__form">
+    <form action="<?php echo Route::_('index.php?task=user.login'); ?>" method="post" id="com-users-login__form" class="com-users-login__form form-validate form-horizontal well">
 
         <fieldset>
             <?php echo $this->form->renderFieldset('credentials', ['class' => 'com-users-login__input']); ?>
diff --git a/components/com_users/tmpl/login/default_logout.php b/components/com_users/tmpl/login/default_logout.php
index a83fbabab9810..31c4681d0d7a9 100644
--- a/components/com_users/tmpl/login/default_logout.php
+++ b/components/com_users/tmpl/login/default_logout.php
@@ -41,7 +41,7 @@
         </div>
     <?php endif; ?>
 
-    <form action="<?php echo Route::_('index.php?option=com_users&task=user.logout'); ?>" method="post" class="com-users-logout__form form-horizontal well">
+    <form action="<?php echo Route::_('index.php?task=user.logout'); ?>" method="post" class="com-users-logout__form form-horizontal well">
         <div class="com-users-logout__submit control-group">
             <div class="controls">
                 <button type="submit" class="btn btn-primary">
diff --git a/components/com_users/tmpl/method/edit.php b/components/com_users/tmpl/method/edit.php
index e3c4952c2d44f..c369063528bb8 100644
--- a/components/com_users/tmpl/method/edit.php
+++ b/components/com_users/tmpl/method/edit.php
@@ -32,8 +32,8 @@
 $hideSubmit   = !$this->renderOptions['show_submit'] && !$this->isEditExisting
 ?>
 <div class="card card-body">
-    <form action="<?php echo Route::_(sprintf("index.php?option=com_users&task=method.save&id=%d&method=%s&user_id=%d", $recordId, $method, $userId)) ?>"
-          class="form form-horizontal" id="com-users-method-edit" method="post">
+    <form action="<?php echo Route::_(sprintf("index.php?task=method.save&id=%d&method=%s&user_id=%d", $recordId, $method, $userId)) ?>"
+        method="post" id="com-users-method-edit" class="form form-horizontal">
         <?php echo HTMLHelper::_('form.token') ?>
         <?php if (!empty($this->returnURL)) : ?>
         <input type="hidden" name="returnurl" value="<?php echo $this->escape($this->returnURL) ?>">
diff --git a/components/com_users/tmpl/profile/edit.php b/components/com_users/tmpl/profile/edit.php
index 2697bd1822c4e..9864f51778cea 100644
--- a/components/com_users/tmpl/profile/edit.php
+++ b/components/com_users/tmpl/profile/edit.php
@@ -37,7 +37,7 @@
         </div>
     <?php endif; ?>
 
-    <form id="member-profile" action="<?php echo Route::_('index.php?option=com_users'); ?>" method="post" class="com-users-profile__edit-form form-validate form-horizontal well" enctype="multipart/form-data">
+    <form id="member-profile" action="<?php echo Route::_('index.php'); ?>" method="post" class="com-users-profile__edit-form form-validate form-horizontal well" enctype="multipart/form-data">
         <?php // Iterate through the form fieldsets and display each one. ?>
         <?php foreach ($this->form->getFieldsets() as $group => $fieldset) : ?>
             <?php $fields = $this->form->getFieldset($group); ?>
diff --git a/components/com_users/tmpl/registration/default.php b/components/com_users/tmpl/registration/default.php
index c531199b6ba37..04a312c42c0b5 100644
--- a/components/com_users/tmpl/registration/default.php
+++ b/components/com_users/tmpl/registration/default.php
@@ -28,7 +28,7 @@
         </div>
     <?php endif; ?>
 
-    <form id="member-registration" action="<?php echo Route::_('index.php?option=com_users&task=registration.register'); ?>" method="post" class="com-users-registration__form form-validate" enctype="multipart/form-data">
+    <form id="member-registration" action="<?php echo Route::_('index.php?task=registration.register'); ?>" method="post" class="com-users-registration__form form-validate" enctype="multipart/form-data">
         <?php // Iterate through the form fieldsets and display each one. ?>
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <?php if ($fieldset->name === 'captcha' && $this->captchaEnabled) : ?>
diff --git a/components/com_users/tmpl/remind/default.php b/components/com_users/tmpl/remind/default.php
index 7f0eafb1a3989..a0d4453f7a180 100644
--- a/components/com_users/tmpl/remind/default.php
+++ b/components/com_users/tmpl/remind/default.php
@@ -29,7 +29,7 @@
             </h1>
         </div>
     <?php endif; ?>
-    <form id="user-registration" action="<?php echo Route::_('index.php?option=com_users&task=remind.remind'); ?>" method="post" class="com-users-remind__form form-validate form-horizontal well">
+    <form action="<?php echo Route::_('index.php?task=remind.remind'); ?>" method="post" id="user-registration" class="com-users-remind__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
                 <?php if (isset($fieldset->label)) : ?>
diff --git a/components/com_users/tmpl/reset/complete.php b/components/com_users/tmpl/reset/complete.php
index 3e8ef3a1f14d3..13fe66290e8dc 100644
--- a/components/com_users/tmpl/reset/complete.php
+++ b/components/com_users/tmpl/reset/complete.php
@@ -29,7 +29,7 @@
             </h1>
         </div>
     <?php endif; ?>
-    <form action="<?php echo Route::_('index.php?option=com_users&task=reset.complete'); ?>" method="post" class="com-users-reset-complete__form form-validate form-horizontal well">
+    <form action="<?php echo Route::_('index.php?task=reset.complete'); ?>" method="post" class="com-users-reset-complete__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
                 <?php if (isset($fieldset->label)) : ?>
diff --git a/components/com_users/tmpl/reset/confirm.php b/components/com_users/tmpl/reset/confirm.php
index b798d9e4dc770..755240c7896c7 100644
--- a/components/com_users/tmpl/reset/confirm.php
+++ b/components/com_users/tmpl/reset/confirm.php
@@ -29,7 +29,7 @@
             </h1>
         </div>
     <?php endif; ?>
-    <form action="<?php echo Route::_('index.php?option=com_users&task=reset.confirm'); ?>" method="post" class="com-users-reset-confirm__form form-validate form-horizontal well">
+    <form action="<?php echo Route::_('index.php?task=reset.confirm'); ?>" method="post" class="com-users-reset-confirm__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
                 <?php if (isset($fieldset->label)) : ?>
diff --git a/components/com_users/tmpl/reset/default.php b/components/com_users/tmpl/reset/default.php
index 3d294e6e622f0..7fa7267a5c047 100644
--- a/components/com_users/tmpl/reset/default.php
+++ b/components/com_users/tmpl/reset/default.php
@@ -29,7 +29,7 @@
             </h1>
         </div>
     <?php endif; ?>
-    <form id="user-registration" action="<?php echo Route::_('index.php?option=com_users&task=reset.request'); ?>" method="post" class="com-users-reset__form form-validate form-horizontal well">
+    <form action="<?php echo Route::_('index.php?task=reset.request'); ?>" method="post" id="user-registration" class="com-users-reset__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
                 <?php if (isset($fieldset->label)) : ?>
diff --git a/libraries/src/MVC/Controller/FormController.php b/libraries/src/MVC/Controller/FormController.php
index 231fce043c985..2da2087177f46 100644
--- a/libraries/src/MVC/Controller/FormController.php
+++ b/libraries/src/MVC/Controller/FormController.php
@@ -566,7 +566,7 @@ public function save($key = null, $urlVar = null)
             $urlVar = $key;
         }
 
-        $recordId = $this->input->getInt($urlVar);
+        $recordId = (int) $this->input->getInt($urlVar);
 
         // Populate the row id from the session.
         $data[$key] = $recordId;

From 1e9e0cd34b83828f222f56ad72174413d121c55b Mon Sep 17 00:00:00 2001
From: Benjamin Trenkle <bembelimen@users.noreply.github.com>
Date: Sun, 10 Aug 2025 18:04:01 +0200
Subject: [PATCH 5/7] [5.3] Fix schema.org with invalid breadcrumb json-ld
 (#45720)

Co-authored-by: Harald Leithner <leithner@itronic.at>
---
 modules/mod_breadcrumbs/tmpl/default.php      |  2 +-
 .../schemaorg/src/Extension/Schemaorg.php     | 36 +++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index df9b5f81cb8d1..b8448d058a925 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -121,7 +121,7 @@
         $wa->addInline(
             'script',
             json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | $prettyPrint),
-            ['name' => 'inline.mod_breadcrumbs-schemaorg'],
+            ['name' => 'inline.breadcrumbs-schemaorg'],
             ['type' => 'application/ld+json']
         );
     }
diff --git a/plugins/system/schemaorg/src/Extension/Schemaorg.php b/plugins/system/schemaorg/src/Extension/Schemaorg.php
index a3c1dc7f10f4f..5cf8f1de042cc 100644
--- a/plugins/system/schemaorg/src/Extension/Schemaorg.php
+++ b/plugins/system/schemaorg/src/Extension/Schemaorg.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\Plugin\System\Schemaorg\Extension;
 
+use Joomla\CMS\Event\Application\BeforeCompileHeadEvent as BeforeCompileHeadApplicationEvent;
 use Joomla\CMS\Event\Model;
 use Joomla\CMS\Event\Plugin\System\Schemaorg\BeforeCompileHeadEvent;
 use Joomla\CMS\Event\Plugin\System\Schemaorg\PrepareDataEvent;
@@ -26,6 +27,7 @@
 use Joomla\CMS\Schemaorg\SchemaorgServiceInterface;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\UserFactoryAwareTrait;
+use Joomla\CMS\WebAsset\Exception\UnknownAssetException;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\ParameterType;
 use Joomla\Event\DispatcherAwareInterface;
@@ -268,9 +270,11 @@ public function onContentAfterSave(Model\AfterSaveEvent $event)
      *
      * @since   5.0.0
      */
-    public function onBeforeCompileHead(): void
+    public function onBeforeCompileHead(BeforeCompileHeadApplicationEvent $event): void
     {
-        $app      = $this->getApplication();
+        $app      = $event->getApplication();
+        $doc      = $event->getDocument();
+        $wa       = $doc->getWebAssetManager();
         $baseType = $this->params->get('baseType', 'organization');
 
         $itemId  = (int) $app->getInput()->getInt('id');
@@ -383,11 +387,30 @@ public function onBeforeCompileHead(): void
         $webPageSchema['about']       = ['@id' => $baseId];
         $webPageSchema['inLanguage']  = $app->getLanguage()->getTag();
 
-        // We support Breadcrumb linking
-        $breadcrumbs = ModuleHelper::getModule('mod_breadcrumbs');
+        // Support Breadcrumb Schema linking
+        try {
+            try {
+                $breadcrumbsAsset = $wa->getRegistry()->get('script', 'inline.breadcrumbs-schemaorg');
+            } catch (UnknownAssetException $e) {
+                // Fallback for older versions of the breadcrumbs module
+                $breadcrumbsAsset = $wa->getRegistry()->get('script', 'inline.mod_breadcrumbs-schemaorg');
+                trigger_deprecation(
+                    'joomla/schemaorg',
+                    '5.4',
+                    'The inline.mod_breadcrumbs-schemaorg asset name is deprecated. Please use the generic inline.breadcrumbs-schemaorg asset name instead.'
+                );
+            }
+
+            $breadcrumbs = json_decode($breadcrumbsAsset->getOption('content'), true, 512, JSON_THROW_ON_ERROR);
+
+            if ($breadcrumbs['@type'] !== 'BreadcrumbList') {
+                trigger_error('The breadcrumbs schema is not of type BreadcrumbList', E_USER_WARNING);
+                throw new UnknownAssetException();
+            }
 
-        if (!empty($breadcrumbs->id)) {
-            $webPageSchema['breadcrumb'] = ['@id' => $domain . '#/schema/BreadcrumbList/' . (int) $breadcrumbs->id];
+            $webPageSchema['breadcrumbs'] = ['@id' => $breadcrumbs['@id']];
+        } catch (UnknownAssetException $e) {
+            // No Breadcrumbs Schema found, so we don't add it
         }
 
         $baseSchema['@graph'][] = $webPageSchema;
@@ -440,7 +463,6 @@ public function onBeforeCompileHead(): void
         $schemaString = $schema->toString('JSON', ['bitmask' => JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | $prettyPrint]);
 
         if ($schemaString !== '{}') {
-            $wa = $this->getApplication()->getDocument()->getWebAssetManager();
             $wa->addInlineScript($schemaString, ['name' => 'inline.schemaorg'], ['type' => 'application/ld+json']);
         }
     }

From a966c2d920abe69c9274381a213f5aba88c77018 Mon Sep 17 00:00:00 2001
From: Benjamin Trenkle <benjamin.trenkle@wicked-software.de>
Date: Sun, 10 Aug 2025 19:54:47 +0200
Subject: [PATCH 6/7] 5.3.3 Release Candidate 1

---
 administrator/language/en-GB/install.xml       | 2 +-
 administrator/language/en-GB/langmetadata.xml  | 2 +-
 administrator/manifests/files/joomla.xml       | 4 ++--
 administrator/manifests/packages/pkg_en-GB.xml | 2 +-
 api/language/en-GB/install.xml                 | 2 +-
 api/language/en-GB/langmetadata.xml            | 2 +-
 installation/language/en-GB/langmetadata.xml   | 2 +-
 language/en-GB/install.xml                     | 2 +-
 language/en-GB/langmetadata.xml                | 2 +-
 libraries/src/Version.php                      | 8 ++++----
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
index 15430db33e584..3d3e0cba50ad6 100644
--- a/administrator/language/en-GB/install.xml
+++ b/administrator/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>5.3.3</version>
-	<creationDate>2025-07</creationDate>
+	<creationDate>2025-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
index 27a1990be4a5c..0a834bf5844d8 100644
--- a/administrator/language/en-GB/langmetadata.xml
+++ b/administrator/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="administrator">
 	<name>English (en-GB)</name>
 	<version>5.3.3</version>
-	<creationDate>2025-07</creationDate>
+	<creationDate>2025-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
index b302deede648d..e2313b6971181 100644
--- 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>5.3.3-dev</version>
-	<creationDate>2025-07</creationDate>
+	<version>5.3.3-rc1</version>
+	<creationDate>2025-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
index 0d08b435f2524..0664452cc62be 100644
--- a/administrator/manifests/packages/pkg_en-GB.xml
+++ b/administrator/manifests/packages/pkg_en-GB.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
 	<version>5.3.3.1</version>
-	<creationDate>2025-07</creationDate>
+	<creationDate>2025-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
index 1ddfdbfb9d212..1aa8c1f879502 100644
--- a/api/language/en-GB/install.xml
+++ b/api/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>5.3.3</version>
-	<creationDate>2025-07</creationDate>
+	<creationDate>2025-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
index f3c113004f5d4..26b2f3d35dab8 100644
--- a/api/language/en-GB/langmetadata.xml
+++ b/api/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="api">
 	<name>English (en-GB)</name>
 	<version>5.3.3</version>
-	<creationDate>2025-07</creationDate>
+	<creationDate>2025-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml
index 179af4ea1d219..34d514f943fe6 100644
--- a/installation/language/en-GB/langmetadata.xml
+++ b/installation/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="installation">
 	<name>English (United Kingdom)</name>
 	<version>5.3.3</version>
-	<creationDate>2025-07</creationDate>
+	<creationDate>2025-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
index 85cd8b94a42b1..bb8e4e179eeff 100644
--- a/language/en-GB/install.xml
+++ b/language/en-GB/install.xml
@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>5.3.3</version>
-	<creationDate>2025-07</creationDate>
+	<creationDate>2025-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
index ab8fca8ae3fcf..702d8814bb334 100644
--- a/language/en-GB/langmetadata.xml
+++ b/language/en-GB/langmetadata.xml
@@ -2,7 +2,7 @@
 <metafile client="site">
 	<name>English (en-GB)</name>
 	<version>5.3.3</version>
-	<creationDate>2025-07</creationDate>
+	<creationDate>2025-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/libraries/src/Version.php b/libraries/src/Version.php
index a91861f5110f2..745cf5c7de740 100644
--- a/libraries/src/Version.php
+++ b/libraries/src/Version.php
@@ -66,7 +66,7 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'dev';
+    public const EXTRA_VERSION = 'rc1';
 
     /**
      * Development status.
@@ -74,7 +74,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const DEV_STATUS = 'Development';
+    public const DEV_STATUS = 'Release Candidate';
 
     /**
      * Code name.
@@ -90,7 +90,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELDATE = '8-July-2025';
+    public const RELDATE = '10-August-2025';
 
     /**
      * Release time.
@@ -98,7 +98,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELTIME = '16:01';
+    public const RELTIME = '18:00';
 
     /**
      * Release timezone.

From 027892ab6e43220ae325c2fa99a51832f3d069e7 Mon Sep 17 00:00:00 2001
From: Benjamin Trenkle <benjamin.trenkle@wicked-software.de>
Date: Sun, 10 Aug 2025 20:02:22 +0200
Subject: [PATCH 7/7] Revert to dev

---
 administrator/manifests/files/joomla.xml | 2 +-
 libraries/src/Version.php                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index e2313b6971181..dd06b34ca0ae4 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<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>5.3.3-rc1</version>
+	<version>5.3.3-rc2-dev</version>
 	<creationDate>2025-08</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
diff --git a/libraries/src/Version.php b/libraries/src/Version.php
index 745cf5c7de740..49de52c50001a 100644
--- a/libraries/src/Version.php
+++ b/libraries/src/Version.php
@@ -66,7 +66,7 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'rc1';
+    public const EXTRA_VERSION = 'rc2-dev';
 
     /**
      * Development status.
@@ -74,7 +74,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const DEV_STATUS = 'Release Candidate';
+    public const DEV_STATUS = 'Development';
 
     /**
      * Code name.
@@ -98,7 +98,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELTIME = '18:00';
+    public const RELTIME = '18:01';
 
     /**
      * Release timezone.