Merge branch '6.0-dev' into 6.1/maint/upmerge-251119

Author: tecpromotion

administrator/components/com_admin/sql/updates/mysql/6.0.1-2025-10-29.sql

@@ -0,0 +1,14 @@
+UPDATE `#__menu`
+SET `params` = JSON_SET(`params`,
+    JSON_UNQUOTE(JSON_SEARCH(`params`, 'one', ' ', NULL, '$.featured_categories[*]')),
+    ''
+    )
+WHERE JSON_VALID(`params`) = 1
+    AND JSON_SEARCH(`params`, 'one', ' ', NULL, '$.featured_categories[*]') IS NOT NULL
+    AND `type` = 'component'
+    AND `link` = 'index.php?option=com_content&view=featured';
+
+UPDATE `#__menu`
+SET `link` = REPLACE(`link`, '&catid[0]= ', '&catid[0]=')
+WHERE `type` = 'component'
+    AND `link` LIKE 'index.php?option=com_content&view=archive&catid[0]= %';

administrator/components/com_admin/sql/updates/postgresql/6.0.1-2025-10-29.sql

@@ -0,0 +1,21 @@
+UPDATE "#__menu"
+SET "params" = jsonb_set(
+    "params"::jsonb,
+    '{featured_categories}',
+    COALESCE(
+        (
+            SELECT jsonb_agg(to_jsonb(CASE WHEN elem = ' ' THEN '' ELSE elem END))
+            FROM jsonb_array_elements_text("params"::jsonb->'featured_categories') AS t(elem)
+        ),
+        '[]'::jsonb
+    ),
+    false
+)
+WHERE ("params"::jsonb->'featured_categories') @> '[" "]'::jsonb
+    AND "type" = 'component'
+    AND "link" = 'index.php?option=com_content&view=featured';
+
+UPDATE "#__menu"
+SET "link" = REPLACE("link", '&catid[0]= ', '&catid[0]=')
+WHERE "type" = 'component'
+    AND "link" LIKE 'index.php?option=com_content&view=archive&catid[0]= %';

administrator/components/com_admin/src/Model/SysinfoModel.php

@@ -314,7 +314,7 @@ public function &getInfo(): array
 
         $this->info = [
             'version'                => (new Version())->getLongVersion(),
-            'compatpluginenabled'    => PluginHelper::isEnabled('behaviour', 'compat'),
+            'compatpluginenabled'    => PluginHelper::isEnabled('behaviour', 'compat6'),
             'compatpluginparameters' => $this->getCompatPluginParameters(),
             'phpversion'             => PHP_VERSION,
             'php'                    => php_uname(),
@@ -334,7 +334,7 @@ public function &getInfo(): array
 
     private function getCompatPluginParameters()
     {
-        $record = ExtensionHelper::getExtensionRecord('compat', 'plugin', 0, 'behaviour');
+        $record = ExtensionHelper::getExtensionRecord('compat6', 'plugin', 0, 'behaviour');
 
         if ($record) {
             $params = new Registry($record->params);

administrator/components/com_admin/src/Service/HTML/PhpSetting.php

@@ -47,6 +47,18 @@ public function set($val)
         return Text::_($val ? 'JYES' : 'JNO');
     }
 
+    /**
+     * Method to generate a boolean message for a value
+     *
+     * @param   boolean  $val  is the value set?
+     *
+     * @return  string html code
+     */
+    public function enabled($val)
+    {
+        return Text::_($val ? 'JENABLED' : 'JDISABLED');
+    }
+
     /**
      * Method to generate a string message for a value
      *

administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php

@@ -109,7 +109,7 @@
                     <?php echo Text::_('COM_ADMIN_SESSION_AUTO_START'); ?>
                 </th>
                 <td>
-                    <?php echo (int) $this->phpSettings['session.auto_start']; ?>
+                    <?php echo HTMLHelper::_('phpsetting.enabled', $this->phpSettings['session.auto_start']); ?>
                 </td>
             </tr>
             <tr>

administrator/components/com_finder/src/Indexer/Indexer.php

@@ -370,7 +370,7 @@ public function index($item, $format = 'html')
         } else {
             // Update the link.
             $entry->link_id = $linkId;
-            $db->updateObject('#__finder_links', $entry, 'link_id');
+            $db->updateObject('#__finder_links', $entry, 'link_id', true);
         }
 
         // Set up the variables we will need during processing.

administrator/components/com_media/src/Controller/ApiController.php

@@ -308,7 +308,10 @@ private function sendResponse($data = null, int $responseCode = 200)
         $this->app->setHeader('Content-Type', 'application/json');
 
         // Set the status code for the response
-        http_response_code($responseCode);
+        $this->app->setHeader('status', $responseCode);
+
+        // Send headers before sending the data
+        $this->app->sendHeaders();
 
         // Send the data
         echo new JsonResponse($data);

administrator/components/com_users/src/Dispatcher/Dispatcher.php

@@ -1,11 +1,11 @@
 <?php
 
 /**
- * @package         Joomla.Administrator
- * @subpackage      com_users
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
  *
  * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
- * @license         GNU General Public License version 2 or later; see LICENSE.txt
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Component\Users\Administrator\Dispatcher;

administrator/components/com_users/src/Helper/Mfa.php

@@ -1,11 +1,11 @@
 <?php
 
 /**
- * @package        Joomla.Administrator
- * @subpackage     com_users
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
  *
- * @copyright  (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
- * @license        GNU General Public License version 2 or later; see LICENSE.txt
+ * @copyright   (C) 2022 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 namespace Joomla\Component\Users\Administrator\Helper;

administrator/language/en-GB/joomla.ini

@@ -926,6 +926,7 @@ PHPMAILER_RECIPIENTS_FAILED="SMTP Error! The following recipients failed: "
 PHPMAILER_SIGNING_ERROR="Signing error: "
 PHPMAILER_SMTP_CONNECT_FAILED="SMTP connect failed"
 PHPMAILER_SMTP_ERROR="SMTP server error: "
+; Deprecated, will be removed with 7.0
 PHPMAILER_TLS="Could not start TLS"
 PHPMAILER_VARIABLE_SET="Can't set or reset variable: "