[6.0] Upmerges - 2025-11-05

Merge pull request #46408 from Bodge-IT/upmerges/2025-11-05

Author: Bodge-IT

.github/workflows/create-translation-pull-request-v5.yml

@@ -31,6 +31,7 @@ jobs:
         with:
           ref: translation5
           fetch-depth: 0
+          token: ${{ secrets.PAT_WORKFLOW }}
       - uses: actions/setup-node@v5
         with:
           node-version: 24

administrator/components/com_categories/src/Model/CategoryModel.php

@@ -1231,6 +1231,7 @@ protected function cleanCache($group = null)
         switch ($extension) {
             case 'com_content':
                 parent::cleanCache('com_content');
+                parent::cleanCache('mod_articles');
                 parent::cleanCache('mod_articles_archive');
                 parent::cleanCache('mod_articles_categories');
                 parent::cleanCache('mod_articles_category');

administrator/components/com_content/src/Model/ArticleModel.php

@@ -1059,6 +1059,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
     protected function cleanCache($group = null)
     {
         parent::cleanCache('com_content');
+        parent::cleanCache('mod_articles');
         parent::cleanCache('mod_articles_archive');
         parent::cleanCache('mod_articles_categories');
         parent::cleanCache('mod_articles_category');

administrator/components/com_fields/src/Model/FieldModel.php

@@ -1125,6 +1125,7 @@ protected function cleanCache($group = null)
         switch ($context) {
             case 'com_content':
                 parent::cleanCache('com_content');
+                parent::cleanCache('mod_articles');
                 parent::cleanCache('mod_articles_archive');
                 parent::cleanCache('mod_articles_categories');
                 parent::cleanCache('mod_articles_category');

components/com_content/src/Model/ArticleModel.php

@@ -423,6 +423,7 @@ public function storeVote($pk = 0, $rate = 0)
     protected function cleanCache($group = null)
     {
         parent::cleanCache('com_content');
+        parent::cleanCache('mod_articles');
         parent::cleanCache('mod_articles_archive');
         parent::cleanCache('mod_articles_categories');
         parent::cleanCache('mod_articles_category');

libraries/src/Application/AdministratorApplication.php

@@ -193,7 +193,8 @@ protected function doExecute()
             ['option' => 'com_users', 'task' => 'user.edit'],
             ['option' => 'com_users', 'task' => 'user.save'],
             ['option' => 'com_users', 'task' => 'user.apply'],
-            ['option' => 'com_users', 'view' => 'captivate'],
+            ['option' => 'com_users', 'view' => 'captive'],
+            ['option' => 'com_users', 'task' => 'captive.validate'],
             ['option' => 'com_login', 'task' => 'logout'],
             ['option' => 'com_users', 'view' => 'methods'],
             ['option' => 'com_users', 'view' => 'method'],

libraries/src/Exception/ExceptionHandler.php

@@ -10,10 +10,13 @@
 namespace Joomla\CMS\Exception;
 
 use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Application\Exception\NotAcceptable;
 use Joomla\CMS\Error\AbstractRenderer;
 use Joomla\CMS\Event\Application\AfterInitialiseDocumentEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Log\Log;
+use Joomla\CMS\Router\Exception\RouteNotFoundException;
+use Joomla\CMS\Uri\Uri;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -221,18 +224,38 @@ protected static function isException($error)
      */
     protected static function logException(\Throwable $error)
     {
+        // Handle common client errors as notices instead of critical errors
+        if ($error instanceof RouteNotFoundException) {
+            $level   = Log::NOTICE;
+            $message = \sprintf(
+                'Page not found (404): %s. Message: "%s"',
+                Uri::getInstance()->toString(),
+                $error->getMessage()
+            );
+            $category = 'client-error';
+        } elseif ($error instanceof NotAcceptable) {
+            $level   = Log::NOTICE;
+            $message = \sprintf(
+                'Not acceptable (406): %s. Message: "%s"',
+                Uri::getInstance()->toString(),
+                $error->getMessage()
+            );
+            $category = 'client-error';
+        } else {
+            // For all other errors, log a critical error with the full stack trace.
+            $level   = Log::CRITICAL;
+            $message = \sprintf(
+                'Uncaught Throwable of type %1$s thrown with message "%2$s". Stack trace: %3$s',
+                \get_class($error),
+                $error->getMessage(),
+                $error->getTraceAsString()
+            );
+            $category = 'error';
+        }
+
         // Try to log the error, but don't let the logging cause a fatal error
         try {
-            Log::add(
-                \sprintf(
-                    'Uncaught Throwable of type %1$s thrown with message "%2$s". Stack trace: %3$s',
-                    \get_class($error),
-                    $error->getMessage(),
-                    $error->getTraceAsString()
-                ),
-                Log::CRITICAL,
-                'error'
-            );
+            Log::add($message, $level, $category);
         } catch (\Throwable) {
             // Logging failed, don't make a stink about it though
         }

modules/mod_articles/mod_articles.xml

@@ -648,7 +648,6 @@
 					>
 					<option value="a.ordering">MOD_ARTICLES_OPTION_ORDERING_VALUE</option>
 					<option value="fp.ordering">MOD_ARTICLES_OPTION_ORDERINGFEATURED_VALUE</option>
-					<option value="a.hits" requires="hits">MOD_ARTICLES_OPTION_HITS_VALUE</option>
 					<option value="a.title">JGLOBAL_TITLE</option>
 					<option value="a.id">MOD_ARTICLES_OPTION_ID_VALUE</option>
 					<option value="a.alias">JFIELD_ALIAS_LABEL</option>
@@ -657,6 +656,7 @@
 					<option value="publish_up">MOD_ARTICLES_OPTION_STARTPUBLISHING_VALUE</option>
 					<option value="a.publish_down">MOD_ARTICLES_OPTION_FINISHPUBLISHING_VALUE</option>
 					<option value="random">MOD_ARTICLES_OPTION_RANDOM_VALUE</option>
+					<option value="a.hits" requires="hits">MOD_ARTICLES_OPTION_HITS_VALUE</option>
 					<option value="rating_count" requires="vote">MOD_ARTICLES_OPTION_VOTE_VALUE</option>
 					<option value="rating" requires="vote">MOD_ARTICLES_OPTION_RATING_VALUE</option>
 				</field>

package-lock.json

@@ -109,7 +109,7 @@
     "jasmine-core": "^5.10.0",
     "joomla-cypress": "^1.3.1",
     "lightningcss": "^1.30.1",
-    "mysql2": "^2.3.3",
+    "mysql2": "^3.15.3",
     "pg": "^8.16.3",
     "postcss-scss": "^4.0.9",
     "recursive-readdir": "^2.2.3",